From patchwork Sat Apr 23 20:03: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: 35378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1084775pzh; Sat, 23 Apr 2022 13:04:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2aWJstcO6qe9MYXYmntt4XLg3TYziY02/fC1OJ6z+Wjip5vQDkp2/S6mtefTbh3S41418 X-Received: by 2002:a17:907:c0c:b0:6f3:8667:9be4 with SMTP id ga12-20020a1709070c0c00b006f386679be4mr795796ejc.325.1650744243947; Sat, 23 Apr 2022 13:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650744243; cv=none; d=google.com; s=arc-20160816; b=cWI9ltJcue83JcGjNssEJAQ8mna8Wq/3xr5ct1INMr4x1rqAbMH7sA2cs1rP33ZCG6 B50qJVGf1vQmQGUQpPIku/FOvUgLcmJM8o3ybB4tNCIOwx27o4SLYaxkTY3U2TQIfoaC xTvJZrMfwMeS45TbIpKg/Lu7J3TuGCp48GrswZwx1a3wI5fYsbtu5Oe98JDYHH7TDLJu DWZJbtq0nevCJPlk/U4m54qwVlW0Z4BmgLTFQjMjlCyj3PQV6mRzviihIVeY1myYh+hd iwO+Gx/kCxVKkGgQSSeo550SiGB21DrPYZS945kIvZf60F1n6BbFHEMNthhrkIRa+K89 r4uA== 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=38WrD/DSc/Is6ZmKl/QILzQLjJVHLAw4lU/VreNevOE=; b=R3DKekz0t0y37Bz4HacId+JI3Azdt0mDFTriccrJeyernkkP7rQpkSqYcP/BmKXuJs 7qfcTprMSNZ4Iwrdu2B9V83bGyLU2pfHzO0M2+fQ3djX6kBzsrCLXoehkPH7WylfzqFN tRDpJKKbNK3yA4GCTuQ4DKv5EZEWr2ji5jUQJVstWGCAH1l6tVEtNYP0d6a8L4fMezdo /LYbl/i1uIG3sWIDl1THY003BQXGm6sDYxDXaO6KAXBDQ3rXXD1Hrl1TKHL6MoLsCij4 25BW+GSV2W/3X/euT6IYgQen5KV7CPPYuCWifKeUhKWz+PuQ8gbfV6i46A4oWHTVJUlk 77DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=K6TGH0Fs; 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 t20-20020a170906179400b006e87aadf6casi9751716eje.965.2022.04.23.13.04.03; Sat, 23 Apr 2022 13:04: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=K6TGH0Fs; 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 ACE0568B320; Sat, 23 Apr 2022 23:04:00 +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 917DA68A34B for ; Sat, 23 Apr 2022 23:03:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650744232; bh=BS2P6o6O+F1nZIx18g+UdZfeBM9dZfgWlZxdhQA1dDA=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=K6TGH0FsRf3QePbD1F5xA7SEgKDgxdYmYnxuRzEzYUcLV9BEThdOOlJEpKzUplkCt Z6CFvlMVpRqX61gSnK77zSnTYH7EppU8+i92oREXN2yItwtrEuw4m01jrcpbmavwc4 hsRfpCnU5ogekVqYmvK3t7IaUFhiMYzES2OFoBaQ= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 23 Apr 2022 22:03:52 +0200 (CEST) X-EA-Auth: KRdrWXXHwe4LHI4VH8cn5KR9TjltDCgkazCEY85TY1c3qiKr8cdE6NK3LEgk7jLb4PytixqHuckRF35hKvyU0AXSlkiA6QXFqyRbhQ/04tM= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Apr 2022 23:03:35 +0300 Message-Id: <20220423200335.36487-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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: R3Q5ScewQPh/ These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c remove MAX_PATH limit. --- libavutil/wchar_filename.h | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f08245..5fdd2ff0 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -1,3 +1,4 @@ + /* * This file is part of FFmpeg. * @@ -40,6 +41,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(unsigned int code_page, const wchar_t *filename_w, + char **filename) +{ + DWORD flags = code_page == CP_UTF8 ? MB_ERR_INVALID_CHARS : 0; + 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_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 */