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 */