From patchwork Sun Jun 5 11:32:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36075 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5654691pzj; Sun, 5 Jun 2022 04:42:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymoAQC+aUcEHL8VqX22/wlrilvC63eddjHot7VlhezU78QFcXXu5KoqIYe2r+4fvRzSotg X-Received: by 2002:a17:906:3702:b0:70c:f656:106 with SMTP id d2-20020a170906370200b0070cf6560106mr12498714ejc.215.1654429341258; Sun, 05 Jun 2022 04:42:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654429341; cv=none; d=google.com; s=arc-20160816; b=tMGM0+iZqoOmjM5jlgRmEEl92o3lk1K7eYBq3OX+54Q1Hg5zi8dyOUGe0bGqmSISVh 9NRJsMpDehUcjemUukep4Hcsv5EaT1J90fiB/SZI30c4JsVwNHw70lP5gwZQzvVtcigE 0nHN30dfZZFodcHuyGFCMObOQnT/Pov8p85dautxMkZ3uWSvnaL/A/CHA1zBZo2XCVYv LZT0fgDnULmQtKumGYKVdN68yThF+y+bVTpb7JNKUq76c2wHyq/E5cchWp4JpE+wlnDK UJPB+zRN+7KtSVDI0brhNO9ikcebNU4t80qrJUs5w3aj4R1yKY1oeoMiW6Rjww4KNpqI 4JzQ== 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=VADZALSnMH3ReFfGhqvOjRIPXVsh+kd8/31IP9oreWw=; b=cvSiWodd2OT8ELZqRzIFzA2xGRzfR/tciwUE1OeU/L7a2WKzrPE2O9k1J0po+Y1Pl+ J3Z1pIgmfjaJzIVPTw3brDlgYueWdI3xhU4GFaEB3R4hlQlv0z0cDbWwGRPaKLA1Gzvs pe6r1eDPTR/8sGhlFxefYzDZsI+io+IxF5nfqce+qQbVsfUe79sydDVmI1HuRmO6luRl myoJt1FMVn/ui7JOycIPuj7sSos78ElX18pcsurk3/j1gsUMHAljfHUbnFBCl0wrbitu lfz42G2iVsTnXw6f/kwCCC9zY+1glCsDT6iCXkPCM1URZ8KGRz8DMCKBT49NAzwQBdkH qq8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=TfSotz7y; 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 m7-20020aa7c487000000b0042e0cfdab0fsi10924761edq.6.2022.06.05.04.42.21; Sun, 05 Jun 2022 04:42:21 -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=TfSotz7y; 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 687D368B610; Sun, 5 Jun 2022 14:42:18 +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 99A2468B4E7 for ; Sun, 5 Jun 2022 14:42:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428790; bh=JVJysR3sN2mI5dLrMpXNS4Jpx4W+YMdMGFmklfp6HUg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=TfSotz7yf35C6RvMVp/FE/682UIouvQPUqwU5d1pZZnut2AfvhujaC83TU61A+VFi pruCyqiweHbf9hAP6ma1H/wAwuhrJPyDrBBkFr8tCUkBUj9b5bss9rfZ+Kh8ZB+o0z 6Twp1c3LRZjrWYhsQFqxrkAZT6MGYvoHROwuaeWM= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:33:00 +0200 (CEST) X-EA-Auth: xcR+Si3W4Pban7XpnQqtgeuC+0vm/iRtUMc5loCxinEP3wZmCUZChnpswWGu87aJ4MHjo2bkkNGeBldfQbyI8WcPyt2ZKf5vlFPPPk+/4uc= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:32:52 +0300 Message-Id: <20220605113252.12197-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: qSUUKR5jXPZ7 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 */