From patchwork Mon May 16 21:23:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1732840pzb; Mon, 16 May 2022 14:23:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxnCYX6ln2fXZMrJey/jR3Fezja2u4Kqokl6GDjUDA3RaVtTWcotJRyjsp7HyNwsSQzfcz X-Received: by 2002:a17:906:80d4:b0:6f3:bead:750c with SMTP id a20-20020a17090680d400b006f3bead750cmr17090348ejx.129.1652736224980; Mon, 16 May 2022 14:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652736224; cv=none; d=google.com; s=arc-20160816; b=vgfhk3KJL8LhO35cEtS78Tv5tgF3gQSFNKwavx5IkaOhfMN4q4zIkAfhJNQvQ+pW5/ k2BgLutfl8yWMzdg+UXXW2vzeZCbkwe7MZfstLWO6kuAN89ArVG7++k+rgx4OEJYfDiw mQpqah5dLL0464WAxuAAJI7E0IHX+NsdDLXGXMZkYvChside4c3E2O3tk6gmKjvFL8E+ Ffytr45hv8R4Jmle1USr/+0SlpnhBUmKRxN2E4asGEgkm0NmY0mg9ShfP7oaYkQtYqaK x4EfQA82T6psqVHh5T9RDdeDd0E8hKoGfM1Jgkq1rUdsDEjsDh/o1JmW8IVtVdbw97nn p0jA== 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=fcTPqPQ8eAfrsE4k1++sEfhOghhCObP8iTjmiiXcScY=; b=OqKx6ZZB7bqNGKLRGD14BDQJivlg037wcKArn3zwYT5hn5SBYkpdR6reS0YKTrfOaO 8jY4WnvhQfrR+MLzhfUSsJGJ1r+eODuR1Wq5iw/pQFhAZ88Y5V/od7v9F4DcRdLl6MCN NAV2yslwjYi3egCnWBCzVuIIHDVsZo8jU8qBbDgfYEIiWXgYzY0yuSuHMR4ivkyKL3Q/ devrracpSoBgZcoSoEfzdt+E5gUOcs9jYcX5XSIAA1ayR06/uH1yEyF5x+rfLEty2nVI WMXKlGtfNe0EIqpdmTCfspo6+8h2rJRe8PNckzvoDfs7iQYA/N+UDZ5Og4Yo4O/r+Kr9 uy/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=g6i5+mHR; 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 sd38-20020a1709076e2600b006e878a53334si533246ejc.363.2022.05.16.14.23.44; Mon, 16 May 2022 14:23:44 -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=g6i5+mHR; 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 7CA1A68B445; Tue, 17 May 2022 00:23:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D11D68B18C for ; Tue, 17 May 2022 00:23:27 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id l20-20020a17090a409400b001dd2a9d555bso568562pjg.0 for ; Mon, 16 May 2022 14:23:27 -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=Y6vVbGWlzpT6MRuQ5PK9XPQyB0pfSbPHbNPuGRT+7ic=; b=g6i5+mHRRcb8bkmWQcPxoalbi6uNe3jx/qFkkYY4pmOzK3+sswbvlpomklY+DezAMF isHWyK4tmfC87dW7ml3VQvK71RMWpIaDzaa50l/8Z3Pt1gvalZ/O166BYSRFkJFB/TNG jgRW7bFDxPQ5KSvZuRUYrHHjxwBeU2mxoPZuO0mjtJnq6/i/r/oqjBnhVxu+UZ9NWw/6 WQM80fZgXAeKNzRV56r5515lCYK8GaDi1eYzhW4RpRZXxDV2G6TnAZuhQhnPsW98dpzG O2WYOvl/8vw42VPdSpTCbtFCki0Uz1bdQYFu+njKpFfHRl7j3Z1O13A2o5QE+P9Rqap8 1HyA== 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=Y6vVbGWlzpT6MRuQ5PK9XPQyB0pfSbPHbNPuGRT+7ic=; b=QZGlYcTNidObXDxnCmcGL8aS9kak4PFJC8FQJBTcTj93Sk3eFrV8JO5ydei7d+TSlR A09O8v1ru/FNOt9X08+hzrBXryU92z2N/6t/giHiLRudPKirtYsNgXuS0FMwMkJnHH7a KPGkKcrGvO90iUDUKGRnlyldSpD4lSvNVa9xeqGtjMIr3U6ZnQitUqMtQbmv8h+vIlWt Z8bJQGsrAOZt9i9pLPMwaWCS6W+4AwRvXymYLstErMjbyt8TY/FLDPDk0xfFp8p6L9n3 sKIGGWpNELeEoEMHgv3cHdOJfb8eEg1wia25Jfgg5Z3nT62Anq3hVtwog87X8R0xwrdr VLbQ== X-Gm-Message-State: AOAM533gfu+OYy+O0LgmbqQSVngWbcok8H0YosbsnIMnBrYbTOhwb3jW PDZSmoFG2rByf9GsEyPUuQoDyznqI5VoPw== X-Received: by 2002:a17:902:ecc8:b0:15e:9e46:cb7e with SMTP id a8-20020a170902ecc800b0015e9e46cb7emr19277657plh.111.1652736205889; Mon, 16 May 2022 14:23:25 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id r8-20020a170902ea4800b001618f5186f1sm1844870plg.80.2022.05.16.14.23.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2022 14:23:25 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Mon, 16 May 2022 21:23:22 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 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: CXrqd7piM4dy From: softworkz Signed-off-by: softworkz --- libavutil/file_open.c | 2 +- libavutil/wchar_filename.h | 166 +++++++++++++++++++++++++++++++++++++ 2 files changed, 167 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..94f8ce54b5 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,172 @@ 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() + */ +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.IsDevicePath() + */ +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() + */ +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) { + 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(). + */ +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() * + */ +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() + */ +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) + return ret; + + // see .NET6: PathInternal.EnsureExtendedPrefixIfNeeded() + len = wcslen(*ppath_w); + if (len >= MAX_PATH) { + if ((ret = add_extended_prefix(ppath_w)) < 0) + return ret; + } + + return 0; +} + #endif #endif /* AVUTIL_WCHAR_FILENAME_H */ From patchwork Mon May 16 21:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1732891pzb; Mon, 16 May 2022 14:23:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzMcvqC2W/jR7CDA298KshJiw9okGJ+HaG05ExXlDtHD9Sw4+qKlAlr3+S8oQJVS6huj+d X-Received: by 2002:a17:906:3a45:b0:6f4:e9e7:4ff with SMTP id a5-20020a1709063a4500b006f4e9e704ffmr16961420ejf.100.1652736234177; Mon, 16 May 2022 14:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652736234; cv=none; d=google.com; s=arc-20160816; b=ENcj+xijB42rOXrljLeeHdq1+lli0nLG0kvIkHXiod5kmDkEE6+GJPQS2xlur89IpY XU6NgOaMOka4Jj2nOo9HBFLKWxaQZcsW3F7biVcBNuIpZUaxN+V6/u4e6UMm2nOOzXFR l3xUg9fO4y3anumimbHjNf69OoDkzEPnsG+UOpCkdjKz2P3yLRuYf0zlR3LIcC10DluA 1Gchf9bO+jI0kO4t89QdKYkaUCOKqKTWF1k5whLIUWuznIzOafYH9bg6RKcM/tANtA91 pQYndhFVk8eNOrexchIZvN5p3qvgBR+yfpkTsXMIP0rUsCydNPOq83Q2An0I8UfBcFId M2CA== 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=5lGGJXzHP0zOnfub1SZ1V/42ncqzEkplTrwUQeiH2Wo=; b=VEcf2I9tlG6DEPIJ9AuKY4bH4yxXQeBuS/mMU7RICIPt5mZC5zig4mjbSQB4tm3420 pJ01pfpEp+itfr0JkyzNeZ49ItvJxItkhD89mq8vgZGM0jeX7XLU7Ky/5zRF2m5mqOs/ DsrB40zMAyfbHeFz07krZkXwWdiwiNdi/fRyFPPjhLkwJ3kaTEAg1J5iQDNzHU7Fq+9s sDXxlM3i/PhYuqnUXdumuew/VIBm9Klq/VWtO6bfhNl4cKcE7GmyLYUPsfcaKRJHniDQ WOjrPD2j6adgPWg8j7z+PRXLpecwYyvPiSiEFRe40os7sBj/ckoiQ4XMIa/iK0oWyC1/ w/lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ekIaH6jY; 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 cn14-20020a0564020cae00b0042ab8c67587si2403009edb.95.2022.05.16.14.23.53; Mon, 16 May 2022 14:23:54 -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=ekIaH6jY; 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 555E268B45D; Tue, 17 May 2022 00:23:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 535C468B423 for ; Tue, 17 May 2022 00:23:28 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id w17-20020a17090a529100b001db302efed6so526965pjh.4 for ; Mon, 16 May 2022 14:23:28 -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=0gVA2fKvCnahMCkE6ckhkQ1B2TquPH11Uf6lOPzeTB4=; b=ekIaH6jY6hUZ7lmEgpWM+KLpDWr3tq5drPkxRI88u8FFEDhjcNYyr5GH5pxJ80G09g W5J9ABAgpGhquBBY7UkvEbTACOKTvW55CCyxzG8p8TxeTg6D0XSamTIDPci/iD5MXEq5 rqSsyd/BEN8v6H05uzXNhq23OwlNXATv0EnPU/jVlAUrs1U3tN9VqK/EAK+JJ7qWtJYX +EUb0gW8kbH6IThohl1JUBwDzHHa1Go3YV/b46iVgwxysJlSxNYRRfZoZ8izCHYQYRBS UJ814wjJN2u1cGovTDW9G77ZxF3b61xMeoSrLfE/vcKqJgZNIvmDwouub8JIX0EIcczG ECzA== 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=0gVA2fKvCnahMCkE6ckhkQ1B2TquPH11Uf6lOPzeTB4=; b=BrugvQk3Cfu5rS8WJNSBVHbgxLPuIBYe9aoJfArpXr0aha3JFz2PQYimjaXbVlmGjD hA5UZ7Xks3Wo37qu0e85/tO/bLPpd/onI6xLWvbtCX0f0bpphSmxxYiVZwBpFznYdQoF GhhsXS+PR6sU8jx9U91pjHyP3Sv1YK1ngRTvoH0wVZegnoSEPUyUphHozLpqmMaBK5R/ i5L+2vZrAc6RLTDZ8kV390Jhjf1vKslIjyB7o6PedyhDWOUKxOj7whzVNlKSa/yGRnXY M+bkV/nNlDWXAaeVDUP5Ph7yyYtZ3cxlTv2utWy4kJMxty8gP52Hv1IjBnBQkY3uOgT2 CMsQ== X-Gm-Message-State: AOAM530jxBIh45pQJT7Wdk4KggCZuTLCQEQsZrD1KnloiR7Ve2Jfoovl AGahJ6GhIWd56Ny9t+Xek1VXRv8LJ41qxA== X-Received: by 2002:a17:903:1d1:b0:15e:9607:d4c9 with SMTP id e17-20020a17090301d100b0015e9607d4c9mr19508243plh.41.1652736206805; Mon, 16 May 2022 14:23:26 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z8-20020a170902ccc800b0015ee24acf38sm7467528ple.212.2022.05.16.14.23.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2022 14:23:26 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Mon, 16 May 2022 21:23:23 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 2/2] 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m4Xg0ni7yLSt From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..bd8c89568f 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,7 +49,23 @@ # ifdef stat # undef stat # endif -# define stat _stati64 +# define stat win32_stat + + struct win32_stat + { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; + }; + # ifdef fstat # undef fstat # endif @@ -153,7 +169,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; \ @@ -177,7 +193,7 @@ static inline int win32_##name(const char *filename_utf8, partype par) \ 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; \ @@ -199,9 +215,9 @@ 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; }