From patchwork Fri May 13 09:53:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp213410pzb; Fri, 13 May 2022 02:53:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzr3RpXK21OZumnTRgdNyo5byzbH5Q0mlVXRKzSmhi6Lt+noug4/doilc9xFR4TgDrT4WjD X-Received: by 2002:a17:906:9b94:b0:6f3:fd8d:8a00 with SMTP id dd20-20020a1709069b9400b006f3fd8d8a00mr3503624ejc.90.1652435616581; Fri, 13 May 2022 02:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652435616; cv=none; d=google.com; s=arc-20160816; b=q7VWjnLb0p9uAM7Z2AJ+F7u4XpDLLar1t2pUyUNxGJ9FFl7jysHv2YZejTdW0okI27 65nmABbxX7qoNpuiDAM+LxrV3F+Qy4YwhHFh2wkgyRmjysfqGTTPTvSr+xMdN5FqPcpf 0xwr4l0XX4EU08ZyGHD/hyallgtWw0/LNkEEkZgz2BLAl9cnkXorEgNrsAf00TD8YBrJ eVgS1d/ctQFDGjiuIPY7F+36WOeBjnLxvUhihdIQ6FldjBmH7HyhT2Mfx/cZvrYMLzQ/ mk1gT8jR6xU1H62gVoua97LoHFt1wUGF1Nz0RN4mK7jGiXcrFR3qUX+nSVN/8WHF4RIG OtZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=nOJdwN85IEJSB/BcCn3/EbZGa08LFdNPMiy6Zrr51XU=; b=PQJy4M7ZHTilO1p8BcWT9b8FkXJlXg6evo4wm7W750L/wf5oGbNedeS8XBubl2ub7M BRupLJwsYDigf+PtPK3Eu62glJN59qhPiDhlSsRqSkKD+8CR4ce3mrLvrGCLxPb6fSB1 P7/YgzACFy5vPLugg9lrb2H5CXUHBgnfEXsB5VHZiTdKmvDGYd6JTvc41RBEmJdwlbow 2ee2UrivQpyb+QtiCgAlNqA7b+rhjEWjJ5Z8fxoE4ah/LLznABg3sIiPZjEKQXa2E41O 9ndyWMcdrAMqahUGnQh30czaVlzOKS5JuCLz15j2xRRu3WAq8O97+ozwdvmlQlzpzRkq ANAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fKjKb8HI; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y10-20020a1709063a8a00b006df76385d9bsi1396836ejd.571.2022.05.13.02.53.36; Fri, 13 May 2022 02:53:36 -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=@gmail.com header.s=20210112 header.b=fKjKb8HI; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D21168B4AB; Fri, 13 May 2022 12:53:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A00B68B41C for ; Fri, 13 May 2022 12:53:19 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id k16so486998pff.5 for ; Fri, 13 May 2022 02:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=rFKoR9zZlu9LQwI1bwPp9HzHK6hzWCIx9ziWI1FVR58=; b=fKjKb8HIUFUDmtRdbTvc9YuDb8eMp4lvrNhh2mbDaKnybNWfk9UYPAtK1beW11fBi0 t9HcRghy9zkOEJlzP5LojLmZknILvSRgAQtB7Mft+mqPTTbNU1WW841/vyuyWIhRhX3V u6Av65gIZZ75X1ZlVNaZ6k2tDeaWx2mEixzkBDoy7u1lOSBOo61XxVA6wEuPC200BzNg LDxTpzKMRr+fDb8964sLlTJZZxtM0QdT5BHGHN60uP9a/auUMj8m0FlsMP2y02RLPxjs xsIbX3qtSHcB9l2FvETCySaNhPpiQ0GepJWdDAPBY8fEXKmnfgaQFrmz7uN4WRlHK8Uq UADw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=rFKoR9zZlu9LQwI1bwPp9HzHK6hzWCIx9ziWI1FVR58=; b=IHmIecmqblEYQN3T1nV6FPoWPzUBqmVpmEKihk4AAMdQiV/RoI4iqxygdheWis7v9F osVnl+imOcPm1XtDMEs6ddNZcCTSc/BUYQqeJJfdRaf8b7gEeXDrbInwZ9dOE93zTIsh O7PIWaDu38jFme4eYCOsGISgCfcoDhCbw2ygYusNXF45U1z3IFspVra3rcMM+ulmq/pD ZVpbBOGuVD/mnv0BZ6KPg68kmmrXfygF4BVldcvgqMwqMQzV3wv0w9zJirElwoXFUJf3 r3RXS/aPhvtLuWB9AFlQkj2sBaDKg2g4M4XNDW6dyonhVLpgLKIUZ03/4p3vVUryLgwy h3HQ== X-Gm-Message-State: AOAM531ajiwTH+64xHAnGeZKNIDj3iGxhquOauXXJF6Z3VQ5FJqd7GCX stM897C+F/ecKJiDbcWtOaWDTDOVPFLN+A== X-Received: by 2002:a05:6a00:711:b0:4fa:daf1:94c1 with SMTP id 17-20020a056a00071100b004fadaf194c1mr3869179pfl.52.1652435597768; Fri, 13 May 2022 02:53:17 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id r2-20020a170903020200b0015e8d4eb29asm1371948plh.228.2022.05.13.02.53.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2022 02:53:17 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <26c579e4ee0065a81f46b18adeba1b97385d8257.1652435595.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 13 May 2022 09:53:14 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] avutil/wchar_filename, file_open: Support long file names on Windows 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 Cc: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OiGOZxSGACR4 From: softworkz Signed-off-by: softworkz --- libavutil/file_open.c | 2 +- libavutil/wchar_filename.h | 123 +++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/libavutil/file_open.c b/libavutil/file_open.c index cc302f2f76..57c5e78d51 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -45,7 +45,7 @@ static int win32_open(const char *filename_utf8, int oflag, int pmode) wchar_t *filename_w; /* convert UTF-8 to wide chars */ - if (utf8towchar(filename_utf8, &filename_w)) + if (get_extended_win32_path(filename_utf8, &filename_w)) return -1; if (!filename_w) goto fallback; diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f082452c..94b4087de0 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,129 @@ 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; } + +static inline int path_is_extended(const wchar_t *path) +{ + // see .NET6: PathInternal.IsExtended() + size_t len = wcslen(path); + if (len >= 4 && path[0] == L'\\' && (path[1] == L'\\' || path[1] == L'?') && path[2] == L'?' && path[3] == L'\\') + return 1; + + return 0; +} + +static inline int get_full_path_name(wchar_t **ppath_w) +{ + int num_chars; + wchar_t *temp_w; + + // see .NET6: PathHelper.GetFullPathName() + num_chars = GetFullPathNameW(*ppath_w, 0, NULL, NULL); + if (num_chars <= 0) { + errno = EINVAL; + return -1; + } + + temp_w = (wchar_t *)av_calloc(num_chars, sizeof(wchar_t)); + if (!temp_w) { + errno = ENOMEM; + return -1; + } + + num_chars = GetFullPathNameW(*ppath_w, num_chars, temp_w, NULL); + if (num_chars <= 0) { + errno = EINVAL; + return -1; + } + + av_freep(ppath_w); + *ppath_w = temp_w; + + return 0; +} + +static inline int path_normalize(wchar_t **ppath_w) +{ + int ret; + + // see .NET6: PathHelper.Normalize() + if ((ret = get_full_path_name(ppath_w)) < 0) + return ret; + + /* What .NET does at this point is to call PathHelper.TryExpandShortFileName() + in case the path contains a '~' character. + We don't need to do this as we don't need to normalize the file name + for presentation, and the extended path prefix works with 8.3 path + components as well */ + return 0; +} + +static inline int add_extended_prefix(wchar_t **ppath_w) +{ + const wchar_t *unc_prefix = L"\\\\?\\UNC\\"; + const wchar_t *extended_path_prefix = L"\\\\?\\"; + const wchar_t *path_w = *ppath_w; + const size_t len = wcslen(path_w); + wchar_t *temp_w; + + if (len < 2) + return 0; + + // see .NET6: PathInternal.EnsureExtendedPrefix() + if (path_w[0] == L'\\' && path_w[1] == L'\\') { + temp_w = (wchar_t *)av_calloc(len + 6 + 1, sizeof(wchar_t)); + if (!temp_w) { + errno = ENOMEM; + return -1; + } + wcscpy(temp_w, unc_prefix); + wcscat(temp_w, path_w + 2); + } else { + temp_w = (wchar_t *)av_calloc(len + 4 + 1, sizeof(wchar_t)); + if (!temp_w) { + errno = ENOMEM; + return -1; + } + wcscpy(temp_w, extended_path_prefix); + wcscat(temp_w, path_w); + } + + av_freep(ppath_w); + *ppath_w = temp_w; + + return 0; +} + +static inline int get_extended_win32_path(const char *path, wchar_t **ppath_w) +{ + int ret; + size_t len; + + // see .NET6: Path.GetFullPath() and Path.GetFullPathInternal() + if ((ret = utf8towchar(path, ppath_w)) < 0) + return ret; + + if (path_is_extended(*ppath_w)) { + /* \\?\ paths are considered normalized by definition. Windows doesn't normalize \\?\ + paths and neither should we. Even if we wanted to, GetFullPathName does not work + properly with device paths. If one wants to pass a \\?\ path through normalization + one can chop off the prefix, pass it to GetFullPath and add it again. */ + return 0; + } + + if ((ret = path_normalize(ppath_w)) < 0) + return ret; + + // see .NET6: PathInternal.EnsureExtendedPrefixIfNeeded() + len = wcslen(*ppath_w); + if (len >= 260 || (*ppath_w)[len - 1] == L' ' || (*ppath_w)[len - 1] == L'.') { + if ((ret = add_extended_prefix(ppath_w)) < 0) + return ret; + } + + return 0; +} + #endif #endif /* AVUTIL_WCHAR_FILENAME_H */