From patchwork Fri Apr 15 08:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158651pzh; Fri, 15 Apr 2022 01:09:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYX/7sCwfxc44P9Off12fOS6PfX5OU9YfQ1xRF4bUbjU6n1MdfkLNneGA04alEkAbKy74V X-Received: by 2002:a05:6402:42c3:b0:41d:665:b581 with SMTP id i3-20020a05640242c300b0041d0665b581mr7334262edc.97.1650010153914; Fri, 15 Apr 2022 01:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010153; cv=none; d=google.com; s=arc-20160816; b=RcWWELwSmL1Bmqk9apDZeesbpUOOngNPJzgSuqxAV+yPRjMVqV7PdRLuNyevwLNjz5 TPlcRxFOqntQNH/wM02d1bTHxsbIXBz6MCYyktVo2vbUz9VNTgV+9nLsnb1jsRvK9UX0 OlYpIf1D4nYe7NilKuZ0ITmd1jySWaVgtrtGtxPfbpxTgLRjQeVwFzizZ1dYfoGcI8z5 fxirFELKeMqk5XzJHwZImmcIaur2BMT/SQvU+/4hZOUIIyMcFQasfGcOxBK+8WCGi949 cdVpgEMMu3qVw/4EN8nBV30nOowqQfRL7xYf8IdZanyosqlFDnYiUby9Ezd9K8JiHmNZ hF1Q== 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=y+9jmfaYlEQO1MO368DneZ8v/0wQmu9wcgcJNWt4ASU=; b=S6oWybF/D5slJuf+ztZ3Xt6YC1KQDb/crNG9lQHYzkS1JIOjP/XpPMfQKPP8g3RUEX Zd01X33yj2B0CUExqkSq2vgX7pCKI5LpCezkjAEKGL9uypI43ioOB+wss7oEPkIP6f2T pWQ2IyVMZikQ1CJj0lE9JTbCA77oo+k8s5auukgecOYqekVV71lXIBzElYBH2jrRfLYH ocAkA6vfwfgC2L9wn1o8c6sdxNgTqHzzdAWg1JNhb/BC8kpnwPJ4Qhcodrkn5vJQeN0D ++T3oh7lpMB3vG6DPhCPygEiyy3H9wchCCqvPbbp0lNdWjoOjv7TjPainJeOf3h4OTTS VFPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=X0wk6uj5; 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 ia27-20020a170907a07b00b006e0332e32f8si606520ejc.456.2022.04.15.01.09.13; Fri, 15 Apr 2022 01:09: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=X0wk6uj5; 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 0E37C68B4D4; Fri, 15 Apr 2022 11:08:26 +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 41D5868B3F7 for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010087; bh=/yN3KUByCM6b4fsOttLDsS56u7cHnBA9FP6Y4OtneXw=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=X0wk6uj5gKhD2XhJbgBzET3XnVfbQzDI1G+82xguFtjZbsbOAd7pYro3ExMYKUhTY L8FQyNeHYyMBWC1oeQGEqS65Cz3EXs4znN+cXvnNv5eb85CmWNEPMnElbY7lm1tfJM s9JH2/Y8wOuinJBZQBeoe7mc1Q0A2hyZOPs9g8yo= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:07 +0200 (CEST) X-EA-Auth: TjZKnO+0zhT3/BdAoNRQE6vRxJxEw2q+BJRdaIbj+VIGNDFBWcfwkVLNoxMrJVxgrJHH8SBCfuWUJti6jxOUpL5YYFxEa68UURwZCgLRagQ= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:43 +0300 Message-Id: <20220415080748.18517-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: TrI2ZvJEfuOP 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 90f08245..e22ffa8a 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 */