From patchwork Sat Apr 23 20:56:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1101158pzh; Sat, 23 Apr 2022 13:57:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBR75uW0fucURFAHrtyy7lCqWkmCM7NiwZ6iPX0r3ZlS03oC5LY4YcRCMptKou1UzuH3dz X-Received: by 2002:a17:907:6e20:b0:6f3:842c:7fd8 with SMTP id sd32-20020a1709076e2000b006f3842c7fd8mr1487954ejc.247.1650747431172; Sat, 23 Apr 2022 13:57:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650747431; cv=none; d=google.com; s=arc-20160816; b=eZvb94SysHFxlwyG1SFXOdcrSeILM8hetJtfrcGsd4SEIDsvOG6Xw9YQZkL6g7Kkls dgZzxbMwdM0waP+gjxLQhv5hs0jUFE28XwlrwWCV3S348VTKzGvRQKXaS32Sx8rhkyvC /MThu8JkzMDuObE5f7KLvtUZArJeHd5hU3Rr76ndj0Xw1wCgV/YS9aakU0PeZD+KVddD FC5smHIzSfTIkAExSZIGJYo0SctW1mghgNBl0SPkoNhGQgGSzO/RA0O0VTIt0d7sPGHS WgzP8jHEjdCfn3GC/K8k+S3ceq8u9i+eCwyHrT+gtQ11GY/kYDXu9Vwhwd3Mw005Pwvh B69Q== 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=6cKyPLm/wqk+mCdNbUMrCtRzpgvK2oEmEsc56Xy+tUU=; b=P3gIMTuarrdfl9kj4IDB5P/SwaQbENV17t8rW+iwiCVjKmc12k90AmSC35CEn9SQOW SbMB9shAFsAmzPke0IVKNYnGhGgl8PRxWwt9BpVkFtXoGdb+dfcQxV2qBwFgSUHlrxYM aqch0Wa58Nzhaykg28YCCkgEVleNHchFMhO/ihjDXrZchv+SyFTmKBoxUuzVGGfZJ+wA f+vfXeGqFSPHeRDzyQsEc9OfrMYBXsOkAspjp36JEWw0ljEU9+/UXcAEsZDUcB8Y0Ed0 3SIZPkstHSM+nzXY7bsq+a/ZprUVtHwkVbP0xp1z74DKBoTPvD/D0wtpTSt7y2X5F8jc vA/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=F7+yPsX9; 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 y15-20020a056402440f00b00423ef0b0967si11817068eda.224.2022.04.23.13.57.10; Sat, 23 Apr 2022 13:57:11 -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=F7+yPsX9; 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 32F1268B3E1; Sat, 23 Apr 2022 23:56:53 +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 C11C668B320 for ; Sat, 23 Apr 2022 23:56:43 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650747397; bh=l09NB6yHnfUJq/XranlSLduuubjHYqI5FnKWV+5Tc6I=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=F7+yPsX9Bz8SoXxdSARKi2SfDjeIbW3ZiVXJ6d65Y5i9qxbAfqDzzVpbw8ymMGL6l VSHLg2DalqJQK849VRYqGktRfsE6rU95OqEMJQek74Gn3Sq7RJ7sDpo0DsGivYlaJ+ z1YP2OvyGMtINuGLjv0zdf4+/xdQZPDlFzPFpmtA= Received: by b-2.in.mailobj.net [192.168.90.12] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 23 Apr 2022 22:56:37 +0200 (CEST) X-EA-Auth: zamZy5hUcD1b2vFewCxWK3uOOu1qeVDKKGdf0jLJY/HmBYizJINVGcT9a8t7lw9Gv3gZ0xq15XicPzMXJ4R1p7gM3PHR1H6uHAsNv5BvvAs= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Apr 2022 23:56:21 +0300 Message-Id: <20220423205626.39039-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 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: mv9NCkpnlxQv 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 90f08245..c0e5d47e 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(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 */