From patchwork Sun Jun 5 11:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652156pzj; Sun, 5 Jun 2022 04:36:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0HH3CUbmFIEut8XFvhGKQoZ+hqOJivpcqbdmbQWyPenDT1PhomBxjjbDqKGET94+R/Ccw X-Received: by 2002:a05:6402:42c6:b0:42d:ed84:6fe0 with SMTP id i6-20020a05640242c600b0042ded846fe0mr20746542edc.58.1654428960736; Sun, 05 Jun 2022 04:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428960; cv=none; d=google.com; s=arc-20160816; b=NH3GWss19EzIuUsMSaiXCQ8xuigSuPCtPFx15plJkdvf6wWTOLjD4eVyGJ+/qlENUO 8IPI8EdqsXoHGJwyIJq0jv/6CigM5G8klSZfjQ3dH3mpJ3LhU+SDNZDY52EsvZHAfD7j N865Mfzxs0mZbNjqbqKTHRR7/kqPlxSBMSYxZVF5Qadycd+yJFFe2OAY9q49A+KvGZQv KQRDmTl0A4GW2bO+PnsXED4Em5YACE4gvBoiBAdO3EJE8uoMATFkwWEl6wrsxEPsEQQk 1lWvCd52qFMIo3pGB04c0UhfAtFwUPjjdrkWfBV9e+oVFxT5sDORtEZSP7XyjXK1Cd5w 4Jsw== 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=BBW3nq6ycSdmNkxU6a1PyNAzvxHobPMaaSVswi/UvVI=; b=tqghAbuxooyV0ZKSkFqoi/YDl4HhJj7OVxNvmd4cP4vPjKcP/wuweMxix8C+BZUYtE G8CFFHLoPajZD9ctAn7WiRAO5pR1TraKDuWjnUY6o5Ma3potaOOoAgXSkJhL9WUDbybw VbrwkxHb4QaUAobM5SpsGwLUCqscmmWjSoQb0SN2+32YxGm9oKi5S3n4LbnuJTbNvYR5 DSdyYhwDrUnWaFALBkMxV31CbSpszOYAPSszGTS0KYWpFn3Ej5EyUDxpuOH9hsHKV5Xv 1P+RL0eJrfXJJwbZVf0Y7vnIXl6pidJC5ROZyoCavqSiJTN6SAF89fFaqflpHb7J2X4p aI2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Nt9hUewZ; 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 x8-20020a05640226c800b0042b5724a3bcsi14823212edd.21.2022.06.05.04.36.00; Sun, 05 Jun 2022 04:36:00 -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=Nt9hUewZ; 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 175BD68B616; Sun, 5 Jun 2022 14:35:58 +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 1580E68B4D2 for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428949; bh=JVJysR3sN2mI5dLrMpXNS4Jpx4W+YMdMGFmklfp6HUg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=Nt9hUewZji5Q8+EcCUTSMPH2sdVvOqYvxXD4SKEevOI9xuY1wORiSAwY3zZvyw6sm K+ULqVg4TNvqB98I5r4arz7dJrrd87f8+TcTi8Zp4Oa5QKqwKT4PyrRHV3mS2IiyhP HyAGUP15R80D2M2GxNTWuL/Mptwp+gK2jeIUvEME= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:49 +0200 (CEST) X-EA-Auth: 4ZLdw/dNTXJIgyTC8MeIx7Uko1czzMJPVMT1wnPNGMm+tLhW0UVUsjd0ghyZwueP308wUWQhRYTgnR0HnO6AkkuwS0QLYjAcXUVAu8uK/7o= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:39 +0300 Message-Id: <20220605113542.12280-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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: 0vukXg1Vhfu9 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 90f0824..c0e5d47 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 */