From patchwork Thu May 26 09:28:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35945 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp280327pzj; Thu, 26 May 2022 02:29:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynp2jKTOARTZgqyfTYC5+LDQYE9zQy07nhaJqQBogIw+LGeQKURIQRbveurNqJ7luvHw/k X-Received: by 2002:a17:906:7b82:b0:6f3:ee8d:b959 with SMTP id s2-20020a1709067b8200b006f3ee8db959mr33994546ejo.458.1653557352826; Thu, 26 May 2022 02:29:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653557352; cv=none; d=google.com; s=arc-20160816; b=zgGwHDZdwAOBrBaEKB7ip5eeFH8FvOYnIsSgCCW+y4ZVv0Qxf+I9z6TGvfbnK1ji2v 9WLg+JydhxRwlzJFwqFM4+IpmXwYhy1ejbfNpjdAaIOZizIJE9RT1QAOTLVU3V9wikwH 5e0Rn/9BZrrYW0JreSiiE3RBF92aM0mKPvEGrezjsWbvzx34TS2FvQVteWB9oU63Muww Mwl1p4Rik4K3xgfYnXgmeRlwdPwiORWDwV0e4CLJ+T1Ks8mJ/QbSu959rTO+jbr67CTY NYaknJBfMovj0ElQF08FAlXcrMVAqrf+reBrNeiHWtIhhdRxh/62u/HbSXg6x7zr5/fz Ls2g== 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=ytKRMp3Hw5G1fs3Vgnow0e7tCrt65PWefYbeSG796I4=; b=B9jTqv7qVKbKBGO0MWY135BKJZzoF+lLB1r9weMzJM3QOHDJPTnT/oq5cTvyG2OAXx kAgWq3UUH2EZNtOJuqJbT83GekQjug8iygTgiHpHd3BZwtkGLbdB1LSBa2m9z/zsZzNo umuowWfknjIaksK3yePQxYBiyDSHLAEkKgBne1xZp25G6hlGc9Wz0dEFBgWS9BQlHnzu f5jZkAHPNo6/WRo0I4OFOfymigmgJDsaDvXMpTYEkpQxTl/atPk1xvajtgrMED69Zfkg cUGaYU3brz41h7x+xpI1bIbp7IvCf1WbuvLxN/9OlyyixgFHWWuJlOomuSe/sV4acZDd c0Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Dtl+nHNM; 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 d13-20020a170906344d00b006fa95d3a2f4si959154ejb.633.2022.05.26.02.29.12; Thu, 26 May 2022 02:29:12 -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=Dtl+nHNM; 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 439F968B5A6; Thu, 26 May 2022 12:29:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EF2568B587 for ; Thu, 26 May 2022 12:28:55 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id h13so1242046pfq.5 for ; Thu, 26 May 2022 02:28:55 -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=m7glWo8l9Vtp0k/JtUjc09ZdO7Jhb0P9L5pdwytooDA=; b=Dtl+nHNMRUWoxIBhbKUDLYhnibIE5aO7QuFNG6EmiDrIxRf6FpJ9ggYtD0O+eRFmvr t+/b0MZ4lgXoOXzGK8sqjujLqJx/dKj6SfrIpFm6t3iXVnyle1l3hnCBO/pYfGTtRD4p gURk7FgA0ZXtX6XF+5rnt1pH/iRlZzuQV+c6fc6N1bfeWn4t7XJVX6Ny4XbLVK0h8i+Z CpB+MEGmxHOuVDCUTgqNvkP9P+WgkJ6TgjJQIZWazaSltcr3EV3K6EW0+BsxmienbkwX 5iJyPawTBbEQWMMyXVqLgxEXLOOQBw9YC/kl9QN/YJKpNof6CqF9hNl1hvvay4G6aU9n 3fEQ== 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=m7glWo8l9Vtp0k/JtUjc09ZdO7Jhb0P9L5pdwytooDA=; b=H7RcxP114081tUxvwzsxzUxTSQgsIZSMEI+t491AY2QVvNNbMxB1DNhDWDftLPRSN6 0Sqt5/dbSUSbWq33ei9cwLj0h2w2HXhQ9dlMjRWyhtxfp39Sy+y2D8/mxdMGEo9P7nXL ovQ837o4Srs5gUlwAedwW0NAdfDakLnBCwFdkbaOnvIsmUULs3RlFgenLUEBkUCDayEI TcSqx8rDa2DBLkO7byJTccMSLYspz3jFkX+DRaXIph9Z+IragN87+Z7t0rOx8vmikLJZ m1+93wERFd7NLA7EhnUWMuDRt9aXxfuqfEIQonx3cXTtMHBqAjZZmK7AFWAcxLxc16ir pIcw== X-Gm-Message-State: AOAM53179Sr+mcogIajBup2vrYkFCZE1FF3USFAU479kSrU5oopxQ3Vr SYhe38wiJjd5pximkwTtYraQYY/5/Tbojw== X-Received: by 2002:a63:7450:0:b0:3c6:234f:e70a with SMTP id e16-20020a637450000000b003c6234fe70amr32323022pgn.619.1653557333707; Thu, 26 May 2022 02:28:53 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id bx20-20020a056a00429400b0050dc76281bdsm943451pfb.151.2022.05.26.02.28.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2022 02:28:52 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <960aa795ffd4018d970fb1768afe3ad11cdb6936.1653557330.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Thu, 26 May 2022 09:28:48 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v8 1/3] 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: Martin =?utf-8?q?Storsj=C3=B6?= , softworkz , Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sDZbwQVV5zuE From: softworkz Signed-off-by: softworkz --- libavutil/file_open.c | 2 +- libavutil/wchar_filename.h | 180 +++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 1 deletion(-) diff --git a/libavutil/file_open.c b/libavutil/file_open.c index fb64c2e4ee..58a6073353 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..f36d9dfea3 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,186 @@ 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; } + +/** + * Checks for extended path prefixes for which normalization needs to be skipped. + * see .NET6: PathInternal.IsExtended() + * https://github.com/dotnet/runtime/blob/9260c249140ef90b4299d0fe1aa3037e25228518/src/libraries/Common/src/System/IO/PathInternal.Windows.cs#L165 + */ +static inline int path_is_extended(const wchar_t *path) +{ + if (path[0] == L'\\' && (path[1] == L'\\' || path[1] == L'?') && path[2] == L'?' && path[3] == L'\\') + return 1; + + return 0; +} + +/** + * Checks for a device path prefix. + * see .NET6: PathInternal.IsDevice() + * we don't check forward slashes and extended paths (as already done) + * https://github.com/dotnet/runtime/blob/9260c249140ef90b4299d0fe1aa3037e25228518/src/libraries/Common/src/System/IO/PathInternal.Windows.cs#L132 + */ +static inline int path_is_device_path(const wchar_t *path) +{ + if (path[0] == L'\\' && path[1] == L'\\' && path[2] == L'.' && path[3] == L'\\') + return 1; + + return 0; +} + +/** + * Performs path normalization by calling GetFullPathNameW(). + * see .NET6: PathHelper.GetFullPathName() + * https://github.com/dotnet/runtime/blob/2a99e18eedabcf1add064c099da59d9301ce45e0/src/libraries/System.Private.CoreLib/src/System/IO/PathHelper.Windows.cs#L70 + */ +static inline int get_full_path_name(wchar_t **ppath_w) +{ + int num_chars; + wchar_t *temp_w; + + 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) { + av_free(temp_w); + errno = EINVAL; + return -1; + } + + av_freep(ppath_w); + *ppath_w = temp_w; + + return 0; +} + +/** + * Normalizes a Windows file or folder path. + * Expansion of short paths (with 8.3 path components) is currently omitted + * as it is not required for accessing long paths. + * see .NET6: PathHelper.Normalize() + * https://github.com/dotnet/runtime/blob/2a99e18eedabcf1add064c099da59d9301ce45e0/src/libraries/System.Private.CoreLib/src/System/IO/PathHelper.Windows.cs#L25 + */ +static inline int path_normalize(wchar_t **ppath_w) +{ + int ret; + + 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; +} + +/** + * Adds an extended path or UNC prefix to longs paths or paths ending + * with a space or a dot. (' ' or '.'). + * This function expects that the path has been normalized before by + * calling path_normalize() and it doesn't check whether the path is + * actually long (> MAX_PATH). + * see .NET6: PathInternal.EnsureExtendedPrefix() + * https://github.com/dotnet/runtime/blob/9260c249140ef90b4299d0fe1aa3037e25228518/src/libraries/Common/src/System/IO/PathInternal.Windows.cs#L107 + */ +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; + + /* We're skipping the check IsPartiallyQualified() because + * we expect to have called GetFullPathNameW() already. */ + if (len < 2 || path_is_extended(*ppath_w) || path_is_device_path(*ppath_w)) { + return 0; + } + + if (path_w[0] == L'\\' && path_w[1] == L'\\') { + /* unc_prefix length is 8 plus 1 for terminating zeros, + * we subtract 2 for the leading '\\' of the original path */ + temp_w = (wchar_t *)av_calloc(len - 2 + 8 + 1, sizeof(wchar_t)); + if (!temp_w) { + errno = ENOMEM; + return -1; + } + wcscpy(temp_w, unc_prefix); + wcscat(temp_w, path_w + 2); + } else { + // The length of extended_path_prefix is 4 plus 1 for terminating zeros + 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; +} + +/** + * Converts a file or folder path to wchar_t for use with Windows file + * APIs. Paths with extended path prefix (either '\\?\' or \??\') are + * left unchanged. + * All other paths are normalized and converted to absolute paths. + * Longs paths (>= MAX_PATH) are prefixed with the extended path or extended + * UNC path prefix. + * see .NET6: Path.GetFullPath() and Path.GetFullPathInternal() + * https://github.com/dotnet/runtime/blob/2a99e18eedabcf1add064c099da59d9301ce45e0/src/libraries/System.Private.CoreLib/src/System/IO/Path.Windows.cs#L126 + */ +static inline int get_extended_win32_path(const char *path, wchar_t **ppath_w) +{ + int ret; + size_t len; + + if ((ret = utf8towchar(path, ppath_w)) < 0) + return ret; + + if (path_is_extended(*ppath_w)) { + /* Paths prefixed with '\\?\' or \??\' are considered normalized by definition. + * Windows doesn't normalize those paths and neither should we. + */ + return 0; + } + + if ((ret = path_normalize(ppath_w)) < 0) { + av_freep(ppath_w); + return ret; + } + + /* see .NET6: PathInternal.EnsureExtendedPrefixIfNeeded() + * https://github.com/dotnet/runtime/blob/9260c249140ef90b4299d0fe1aa3037e25228518/src/libraries/Common/src/System/IO/PathInternal.Windows.cs#L92 + */ + len = wcslen(*ppath_w); + if (len >= MAX_PATH) { + if ((ret = add_extended_prefix(ppath_w)) < 0) { + av_freep(ppath_w); + return ret; + } + } + + return 0; +} + #endif #endif /* AVUTIL_WCHAR_FILENAME_H */ From patchwork Thu May 26 09:28:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35946 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp280359pzj; Thu, 26 May 2022 02:29:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4+uDBkxapqAs+FEBGYmdj0tUq9Xtpo4bGNJ9BvQBX7tGV9VTdAoiibkbEX+xcPcP1O15F X-Received: by 2002:a17:907:1693:b0:6ff:be2:fe6b with SMTP id hc19-20020a170907169300b006ff0be2fe6bmr8434337ejc.674.1653557361824; Thu, 26 May 2022 02:29:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653557361; cv=none; d=google.com; s=arc-20160816; b=q79piLBU3v0os4t4YVSk7Fm5koWeho3sXS6VMB9kX2GUHsqvx7w0OHzLHyrOrQ1ImE 5hJ7JH94COUp5eMpCKoxGMPumne96O+Hny+1S+VvqHLfPtASHOszoW1XV3wJmPa2FaIB +Lk+wh5z+OR7Lp03R2yJVb9GMAeGLzrGo6pTcbtn6Mn9wa6k0HNI3JWl6ACyAOlXQMUn EKU9E0YhmIuQJ2K4GDShb55Sa4yXyCTn1YzPFmDRiSrsGdhu91anuYnC8NBSVEkVXN+z oXZAeXr/gbdwGXnbRgQ/wfyy8vQHeYkGDRWwgUiT+j5Sw966Bgd2hEly4edFoRmoSOli tLgw== 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=Fd7Hy3Q+HbYsU+tp2ioFW4gE6etfMUrSW3uocsLPppo=; b=Q3A292ip3UpIjnEln5RZ0cctk6T4j624tpDKpFpLFO3fTFpqfxDYTVLuEcTXyFde6n oIDSb2VOWPdMxYSj5RHMrZUKnRCmpcY4abcy7lXbmJ4g3SLbUzatF9vBN8Tu0Nryxvzz h5RpYFmmjGpEQIjyeDhMxrpKPrlCSUStNtM+nxou/FsQvI5sAmXZaU5UZPOowbjVPc2y BOgChxLWXJ05Pec6BKoyuakbRZTqteMiN3HLMDUExxYN6QmOeYSmEgATGTL3dxRjpYrM 1Z81aPuMvi0tWjG++R51PQ4VGprPGnB+GOkCoP+dQcI74KjXzLPzjSXA2RCJN7ksxKq/ 7o3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NjFbUGY7; 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 z12-20020aa7cf8c000000b0042bb19c6413si81902edx.503.2022.05.26.02.29.21; Thu, 26 May 2022 02:29: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=@gmail.com header.s=20210112 header.b=NjFbUGY7; 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 2EC5768B5BB; Thu, 26 May 2022 12:29:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA55A68B57F for ; Thu, 26 May 2022 12:28:56 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id pq9-20020a17090b3d8900b001df622bf81dso1246903pjb.3 for ; Thu, 26 May 2022 02:28:56 -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=ecxIyE5ESww6aSLsGupRo4tBtV9tVupIqN0ewBlYJoY=; b=NjFbUGY7my/sDtmj6qgZvuB2cvuPRlY6bjQJeSG85fPj+EiDhQQfDjF2F1ngiEWt5u EsgDMY0n5cacZFOeL3Rmst6/HYHdxspt5pbF7ZXoCy6sL5cUWJNasS+TYydtIz1uSzJD /TItMhNKZxjQf75EVEatBqAUBI5Jji80b8RptQI/FzdFRu8uR9bEJh8ikytFx2wiDg1F Hx0BmZJuBofavg03n29zPZKJAXnCZZQtA19Xy3A+776h6YvWBOQCRYAXSPMfAHS3hUaW SNKQdgU7P7kUeOGB87cHoifzSvSlq9byp6l1I6xlUyPneyaCv7SMr0x+uTxXi2mo0Clo 1wCg== 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=ecxIyE5ESww6aSLsGupRo4tBtV9tVupIqN0ewBlYJoY=; b=wXMVjBgQYdsxa53+Bt8yiohmgkph+dpvHYSx07xALNDjs4PtPYPIYTyI7TzRKuboXp l3tARbGWSJ6L95h5FlU4inLb/MoInIG1Ca5Tu0AxWV5xTNrzx/XY5VroOCIqbfNwaLYU wqBI501yREM/599uMvM881mdf6xFNd3mRuSZ1qLuTJE1JcOhuZAmyN1AtGOOZKzLjzNi 8IjzLZaNJmQ66y5x6knuYAr20aRmwBxsowMbMx1TqYpbdSeyvMYaZv1lnDtH42fzqoEN zk+7FN/i2vHJPV6pZzdnzxttGlbbuM98XQ5sinTnaokzk86onaxzJq3Q5u77/S9LJCOn cpSg== X-Gm-Message-State: AOAM530IAZXdMSMpx8b0oMjO6clpe/CbFZM4nbGzWXgxBSGCutTLnz7+ evoK9wd4FNh2EEjmk5NbEdC+mi+wWZV25A== X-Received: by 2002:a17:90a:930b:b0:1d5:684b:8e13 with SMTP id p11-20020a17090a930b00b001d5684b8e13mr1646728pjo.153.1653557335076; Thu, 26 May 2022 02:28:55 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id q8-20020a170902f78800b001618644d8b5sm1000531pln.154.2022.05.26.02.28.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2022 02:28:54 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Thu, 26 May 2022 09:28:49 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v8 2/3] avformat/os_support: 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: Martin =?utf-8?q?Storsj=C3=B6?= , softworkz , Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VdbEnUFTsjQ+ From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 116 ++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 25 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..958976cc6f 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,11 +49,38 @@ # ifdef stat # undef stat # endif -# define stat _stati64 + +# define stat win32_stat + + /* + * The POSIX definition for the stat() function uses a struct of the + * same name (struct stat), that why it takes this extra effort for + * redirecting/replacing the stat() function with our own one which + * is capable to handle long path names on Windows. + * The struct below roughly follows the POSIX definition. Time values + * are 64bit, but in cases when _USE_32BIT_TIME_T is defined, they + * will be set to values no larger than INT32_MAX which corresponds + * to file times up to the year 2038. + */ + struct win32_stat + { + _dev_t st_dev; /* ID of device containing file */ + _ino_t st_ino; /* inode number */ + unsigned short st_mode; /* protection */ + short st_nlink; /* number of hard links */ + short st_uid; /* user ID of owner */ + short st_gid; /* group ID of owner */ + _dev_t st_rdev; /* device ID (if special file) */ + int64_t st_size; /* total size, in bytes */ + int64_t st_atime; /* time of last access */ + int64_t st_mtime; /* time of last modification */ + int64_t st_ctime; /* time of last status change */ + }; + # ifdef fstat # undef fstat # endif -# define fstat(f,s) _fstati64((f), (s)) +# define fstat win32_fstat #endif /* defined(_WIN32) */ @@ -153,7 +180,7 @@ static inline int win32_##name(const char *filename_utf8) \ wchar_t *filename_w; \ int ret; \ \ - if (utf8towchar(filename_utf8, &filename_w)) \ + if (get_extended_win32_path(filename_utf8, &filename_w)) \ return -1; \ if (!filename_w) \ goto fallback; \ @@ -171,37 +198,76 @@ DEF_FS_FUNCTION(unlink, _wunlink, _unlink) DEF_FS_FUNCTION(mkdir, _wmkdir, _mkdir) DEF_FS_FUNCTION(rmdir, _wrmdir , _rmdir) -#define DEF_FS_FUNCTION2(name, wfunc, afunc, partype) \ -static inline int win32_##name(const char *filename_utf8, partype par) \ -{ \ - wchar_t *filename_w; \ - int ret; \ - \ - if (utf8towchar(filename_utf8, &filename_w)) \ - return -1; \ - if (!filename_w) \ - goto fallback; \ - \ - ret = wfunc(filename_w, par); \ - av_free(filename_w); \ - return ret; \ - \ -fallback: \ - /* filename may be be in CP_ACP */ \ - return afunc(filename_utf8, par); \ +static inline int win32_access(const char *filename_utf8, int mode) +{ + wchar_t *filename_w; + int ret; + if (get_extended_win32_path(filename_utf8, &filename_w)) + return -1; + if (!filename_w) + goto fallback; + ret = _waccess(filename_w, mode); + av_free(filename_w); + return ret; +fallback: + return _access(filename_utf8, mode); +} + +static inline void copy_stat(struct _stati64 *crtstat, struct win32_stat *buf) +{ + buf->st_dev = crtstat->st_dev; + buf->st_ino = crtstat->st_ino; + buf->st_mode = crtstat->st_mode; + buf->st_nlink = crtstat->st_nlink; + buf->st_uid = crtstat->st_uid; + buf->st_gid = crtstat->st_gid; + buf->st_rdev = crtstat->st_rdev; + buf->st_size = crtstat->st_size; + buf->st_atime = crtstat->st_atime; + buf->st_mtime = crtstat->st_mtime; + buf->st_ctime = crtstat->st_ctime; } -DEF_FS_FUNCTION2(access, _waccess, _access, int) -DEF_FS_FUNCTION2(stat, _wstati64, _stati64, struct stat*) +static inline int win32_stat(const char *filename_utf8, struct win32_stat *buf) +{ + struct _stati64 crtstat = { 0 }; + wchar_t *filename_w; + int ret; + + if (get_extended_win32_path(filename_utf8, &filename_w)) + return -1; + + if (filename_w) { + ret = _wstat64(filename_w, &crtstat); + av_free(filename_w); + } else + ret = _stat64(filename_utf8, &crtstat); + + copy_stat(&crtstat, buf); + + return ret; +} + +static inline int win32_fstat(int fd, struct win32_stat *buf) +{ + struct _stati64 crtstat = { 0 }; + int ret; + + ret = _fstat64(fd, &crtstat); + + copy_stat(&crtstat, buf); + + return ret; +} static inline int win32_rename(const char *src_utf8, const char *dest_utf8) { wchar_t *src_w, *dest_w; int ret; - if (utf8towchar(src_utf8, &src_w)) + if (get_extended_win32_path(src_utf8, &src_w)) return -1; - if (utf8towchar(dest_utf8, &dest_w)) { + if (get_extended_win32_path(dest_utf8, &dest_w)) { av_free(src_w); return -1; } From patchwork Thu May 26 09:28:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35947 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp280420pzj; Thu, 26 May 2022 02:29:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfuuQTt4aKdyA9AqZ164U/+i9vBvg1Ch+fVpVPp+KKnXVmL1PyJHetp0bseKep7DTrRuDL X-Received: by 2002:a50:d7d7:0:b0:42b:d06c:33a with SMTP id m23-20020a50d7d7000000b0042bd06c033amr5308478edj.363.1653557370654; Thu, 26 May 2022 02:29:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653557370; cv=none; d=google.com; s=arc-20160816; b=ZmM8Zy0Wwq9hb0j8/KbxpsNnLhARm+oZi/mI8IhrpQp0T/I8TNrihbDFvYGAQtdHzq DoOA4bP0xejp8nI+YbgY1QgAScRjgIyJQy7iySHDWb1D64OhPS+qPdSsp0pNkD9GKBoA axqXj+V6i/wlYPkNuldZIGA3apExHmcdexHN4I74vp123tTDk68acQyVYheLF0MzKaZW pHWrnzm+VIPc0pMmsqa0+eHwoYGdAEqwU7gDZ1sBubA9iHUSXcSjVdNhzlMJYic8Gla+ Dfvg6d2qIZnReFRBIIcCS8IeWyo4YGvjN1BddZrEM1mkuyr0RElJMybH5fFpSbTVOgFJ IJeg== 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=MKGGsWTtOoDiDc4ZKXa55XjEEsJ+PRbZboWJmJJIwys=; b=tiTyPdxIzWltyabQHzKfdYRUyUO81UQMHcEQtc0ILQH5xcVL4Uc4Dgbdbd13sCApIT ks+utHA4+n+DSL2UWx8Jjv2qWn1OPKxI2S1D885KA+MJVVaUvDPiHlPLdwW9/HqpLT5/ szYY6OUiqCXW92HghSGfOZc0Y9rDM7cacaS2uXsvKioZGiirpmdwfPGPr1mdj3rM+5wS 6itFoHJXa/e9N1B+TWrS077Et1wgT7iIWH94zUree1BTh0eXkiBL/DMmrQdmMrC2DSLC PHDl/KuVJAYTFmVkvRuw1q7C7sBkhKgsdYPbgGPKmB1rrFSZP4g+XQ7DJrmdOcJ1FvL5 y9Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AXGitD2g; 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 g11-20020a056402424b00b00425b8cd99c0si1171145edb.370.2022.05.26.02.29.30; Thu, 26 May 2022 02:29:30 -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=AXGitD2g; 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 2DC3768B5C5; Thu, 26 May 2022 12:29:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E7EB68B575 for ; Thu, 26 May 2022 12:28:58 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id a13so987555plh.6 for ; Thu, 26 May 2022 02:28:58 -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=GJ4FwzW2alurhInEkW/HsCPnnkTpZPdQRnVXPA2Vsq0=; b=AXGitD2gKeurK6sVs2gmnu/G9JZwXrpnmMb4OjEhOV4ZvxQ3qif/xNHIhtz4FVmOoZ Z0gXg/Tb8y1Ump4Bkegnl/x6gwrk3oIg+eGDampXasVE8juqUPnqgJuasAev0Z3s+hgF taDvknGDtAVk1uTmCsmAtYwlcnOLd5DHnBh02kC+GYub0x2CdD/OnfKUrq6qgI3ZBfcH mretpfNfUlJl9gXtuaAaHTEN2qSJCUdkLt3aNf8pBnb3X0abTMtqcUM/AnOjAT3U8/Pz BqFf1mCKpC8AdvgCf5MGsT/QptacpEA7nq/9+B+W9ufZ1qnPCMYVeinKJnqFCKSQ7RyH tkfw== 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=GJ4FwzW2alurhInEkW/HsCPnnkTpZPdQRnVXPA2Vsq0=; b=plH9mH4ikjDNmRcueeTekXX011OwDwNz0km+4iP622V+rZit2TaX88Oe6sjrIBFk60 eTkEMdGI2oOTG9rVsf3Pk/qPn4RFaaV4yfNgy5JAcMdVzgHSfhZIZvBclr+7tMgvcu5g z5B6DOUkhWfUVGzv57zYkF15jeMslP0s0zmawi71O0YyITXCpNTA4h2EFzaluLBrFP4t m7F5BbNOTC4it/4sMbCFAzsswreehswcr3nSFPeWE1QvU1cqdt/F0gV5XgotD0nAQeqG HqDqXmuAaTEEl6FcEVsXxuhu33A5MEfzc1zAZ+jHDL8ucqXROQg9hBaq1A53IUOARali qg4Q== X-Gm-Message-State: AOAM532DRZXJLzP1Syya9WYf5nZeDnbBSnNRSJZEHJZHWA11aKBaNtxY KPl54OuDQBnAbOE8I6q+yb8+VVwDu75fxg== X-Received: by 2002:a17:903:1c1:b0:161:aa16:f279 with SMTP id e1-20020a17090301c100b00161aa16f279mr37460104plh.88.1653557336490; Thu, 26 May 2022 02:28:56 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id r11-20020a170902ea4b00b0015e8d4eb273sm987486plg.189.2022.05.26.02.28.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2022 02:28:55 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Thu, 26 May 2022 09:28:50 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v8 3/3] avformat/file: remove _WIN32 condition 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: Martin =?utf-8?q?Storsj=C3=B6?= , softworkz , Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MaoDFs0Im+Z3 From: softworkz stat is now re-mapped with long path support in os_support.h Signed-off-by: softworkz --- libavformat/file.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 063d7c5aa2..98c9e81bcb 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -154,11 +154,7 @@ static int file_check(URLContext *h, int mask) ret |= AVIO_FLAG_WRITE; #else struct stat st; -# ifndef _WIN32 ret = stat(filename, &st); -# else - ret = win32_stat(filename, &st); -# endif if (ret < 0) return AVERROR(errno);