From patchwork Thu Jun 9 19:04: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: 36098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp542461pzj; Thu, 9 Jun 2022 12:04:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAfVBFil3HWUhipL1fys1wMjREIyn96e4eoNy5BZn9t5kYHqSWCLVJKKRLvKof4SdPVbbv X-Received: by 2002:a50:ff04:0:b0:431:6a31:f19e with SMTP id a4-20020a50ff04000000b004316a31f19emr89577edu.89.1654801491115; Thu, 09 Jun 2022 12:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654801491; cv=none; d=google.com; s=arc-20160816; b=FATKmo/4u57jBf9DnTyuufq6rOZ2RaoVeJDG6ZnQwXvuY+FkTeah5c9BvAOQunwvfD 6lu3DNZaX2xIR3/c4auvOJLKjLJ5uNje44Tcf2cYjsgZk7e9y3dYKOfrKeduTzgnaTP7 scDLzUpjCIC6BrTx/i1rWV2TXEfCaL2NxNOxgBnC/SI6g7Ky4Xj9KUa4VVfw6Ln43xuO jchYiFiiwUP2WwkHnBbxazQ8jNkCWxWThWRKb6NbmNBngFbi91kYkqkprote4qMBmP+P uUu1Aus5XB1Eieq8VzODcL7vQPjexXnabMu2LOoTOskNafDzZCmrbER7ez3YBqIDJljZ wRyQ== 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=VuA6WRvdAU3Xj8j/3F8qDvHwlT74AdSNinRr9cCpUKw=; b=xmPFPpcKQ6Vqgf+297mxwhbGGTGz5z5WLq3+CVJ4Kd6Fre+v0uJMAp5xhFykTORNFn 6zHTkowwi3GVr/tiRLKRi1ghcD3C0MpjV5gqN5EuONvTP6aQnTbmav7F8E53GFF+B9N/ jMr+rnHV1rM6b0CkKu8flmbqH4VH2l+Hq6ZxcTaCg3N3MJm6BDqjzsy/gSo5uqbFEhin KWp9V0jyzidMyCWQpK2D8hBxb+7mmCJmEa8sjLQCWIOJPWsztLKyZv+vA3tJtbmqaz6C PqcUaGd6VAr+pQuLzduanuG3GBTljNPZyEoUTX5wqNx/5XCpBjwjOIa9fL37AjV0J5uT mrLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=cOOVUoei; 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 k2-20020aa7d8c2000000b0042dc274de99si4217995eds.232.2022.06.09.12.04.50; Thu, 09 Jun 2022 12:04: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=cOOVUoei; 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 43D1468B7AB; Thu, 9 Jun 2022 22:04:25 +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 061B868B760 for ; Thu, 9 Jun 2022 22:04:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654801453; bh=iU5AFvt7nf9q02CxCI6FGFXWnl6IDaX9y4aPPz7wogg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=cOOVUoeihCYwOTTbORD4i2vkiiZUgzG3iBezLx4nMTr1yFt/rsJAy1LM9R+1P0Peb P6coz4KEVU8xheFSkmT6TSUhhfkD1N+9l6gY/yB1An5JDRAnnJ/qwWqWDQF9jhJZzF U0zCXZIyLwt0htdWROBYhXyTvtQjB9WQwsdx2qHc= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Thu, 9 Jun 2022 21:04:13 +0200 (CEST) X-EA-Auth: G8rDSMTXPjyDoizMvMEp7hsUj1dapxTmNNR0U/4fK8/slUCMQovrx/YoykOm9SDF5b3QS0ECcAKpXxImtfyVp3kGqBgGyyMJRWvlnp6pAG8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jun 2022 22:04:03 +0300 Message-Id: <20220609190406.6339-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 1/4] 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: wqEWs8EphUYc These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c to 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 f36d9df..90f6a53 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -41,6 +41,57 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) 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; +} + /** * Checks for extended path prefixes for which normalization needs to be skipped. * see .NET6: PathInternal.IsExtended()