From patchwork Sun Jun 5 11:34:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36070 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5651748pzj; Sun, 5 Jun 2022 04:35:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNfjjKJ1tGeRftdDLCjAUpI30otzo3AlXKVtMhLw9cjLwemcMCcCyQ00VT4PVPMTXJRiWq X-Received: by 2002:a05:6402:4248:b0:431:1133:aecb with SMTP id g8-20020a056402424800b004311133aecbmr6780603edb.222.1654428902485; Sun, 05 Jun 2022 04:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428902; cv=none; d=google.com; s=arc-20160816; b=Z3o4WGCOlRpShdTP0TOAoPXoec7LidJgnRPlSg2wlaZcnUN0qPNsAVe1VYu+jLs7M7 60yMnNIF5MM6QXpS29Q93jL/61p88NVQxnhEE8SfV8fIww/ZpDjE+m6u9qUE2FUtwj7q 4ZW9PH/kahsHMyk0D2wUi7eyx1jCoIN50hPVBclKltq0ItykL4B+zDHpfEzlgsgDhry+ q7haDdSYNLJKb6nVZtgJ6fCbiZ7KuGwnaU/RsYGdxNUfcS1nIk1Mhhud4y9aZMz9+rVT 2t6ZiQEYBFXNZsZRJ+6cDKm+374PiFxw3uwDvu9VRJGTF3g04qBLKBh9p49bFlC4FNMZ QY/w== 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=q3LkNx/uO03r02cng4RLyLKu8phsLrT6Xy4fnXfiUrsp2xwyh4PuuWZlAl0VUN5EgN l29CJR+4WB0wUvTOA7f3QPjOABgS68WEGCfUl6oqBLHkn6YUYbFTQrF77P1HMhR/YHfR 5vMlScouwbVrDSzEWqunfkojraD+TFH4KR5pxJAnYROPBwMtz9Mp3fdAaVYU6rHExdiP S26lHcjWlW0H20Wl30hMN/AJr7tHuRSJi2OzAGcN1PgnbJiX6x9aqtDNKyZ/Xw1+tMF4 ZAq3ZWofwjwyA13V3CGOya6PKRuCB7FMpee8sn0Q/EcbvmxPKCzFcaG/Hc1lj5J+oEZz 5gOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=oYpxDCJ0; 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 e20-20020a170906c01400b006feba25b350si7988843ejz.106.2022.06.05.04.35.00; Sun, 05 Jun 2022 04:35:02 -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=oYpxDCJ0; 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 BA9D768B5F2; Sun, 5 Jun 2022 14:34:56 +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 B6BB568B4B3 for ; Sun, 5 Jun 2022 14:34:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428888; bh=JVJysR3sN2mI5dLrMpXNS4Jpx4W+YMdMGFmklfp6HUg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=oYpxDCJ0NR2NNXOhlK//pu1i34qZ+PVqmUBZp3VZCjbnx2HrP19DwgeNF7onMeY4L pcWoc2hZp5GJHp++qe80CXKvtSj6dHrBI57UhWwpfVG1/lx6c0+69O+9m0nyvXILRa UdDxW3Qjt4wdEhXFhFBNvG+PZiHad9gspbA4aiCM= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:34:48 +0200 (CEST) X-EA-Auth: e7PlCv0VXFL4SvbL4R1HKV36WahG8yFSLk4yYjVPTv/BiW8/Z6PXKyVRc3m6Trv00sjz/588v3TywbtYNdDjjfpIR+e2uwZsT/o3k/aE/WE= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:34:40 +0300 Message-Id: <20220605113440.12229-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: Th+qTTzirmRv 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 */