From patchwork Sun May 15 22:17: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: 35782 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1281579pzb; Sun, 15 May 2022 15:18:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzo07unBlPeI0i2zGCkSx1FsmRfUGrHNPg9s5z0WbJiIk7ADjqcFkp1VBQNuQzcAJvqraDl X-Received: by 2002:a17:907:7dab:b0:6f4:6650:395d with SMTP id oz43-20020a1709077dab00b006f46650395dmr12786618ejc.82.1652653091152; Sun, 15 May 2022 15:18:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652653091; cv=none; d=google.com; s=arc-20160816; b=kBQFSnU2c0zo4blY4mRO0rRJMip+B3ad5bDXgufeA9LYyUBzdnWf5Y+2mJjgXKV71w BDczZpCdbW8zHg8y4PhrqtaMwC8WOQ+mh9A1iwkJk+RfN5sOCdDxgP0k9utGkFIk2rzi 0KPGYYt/foeULutUoLLtb9cQuVgBEAwUY47XfjzHJDIffeW6sixf5aLYBmchCmbP9yz5 6Slgoo4eaiC356UILWSVgupfsCTJJ4ZpAl5Q5YOL6yLubcMBo55zm/k75oSPP8QwjHPF E5xOeLNiJ6C+dVPAA88ULqQzvH1KHfttYZEtN7YSwwUbd7NLqlWwMHTNQEJcxhTE7vQQ Kusg== 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=OLt8BxPDGix1V/A9FkjmdllGEoMs4bHPBFWshaugAVw=; b=kZ0+0R4oOtsO7e/b5Kb6gWOZSRJc6St3dUYH3fuHp3D4S+Ko1Sd80NarYQnKITV0se l5Z6xrZq0OdxBxWoU6ECU0II2om6ixMi3o2amaljiU3SkgP+wmFd5jIjZXpondQ63dsm 7r0LyV6N1Wx+pNUF3DabaGvxP/z2KAXvb79vvqypg/fQUpT3sufF11PmejnyJvAENYsG Oa1XdE9u5dCVMZByYTBqJ0w/lIIi1KJsWTaLAOzGscXe3LCIUFe16kRjX6B5WOjF9Cus o1FhcI/81YEUwWT5tbI+MVj/A1VC0BHViq7z05nIWAb4uaptzb20sZnKWu2RsYnfax80 4miw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WAyQU0sB; 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 p3-20020a1709061b4300b006f37ff30509si7918205ejg.508.2022.05.15.15.18.10; Sun, 15 May 2022 15:18:11 -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=WAyQU0sB; 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 7CFF868B4F9; Mon, 16 May 2022 01:18:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFC6C68B4D7 for ; Mon, 16 May 2022 01:17:54 +0300 (EEST) Received: by mail-pj1-f42.google.com with SMTP id t11-20020a17090ad50b00b001d95bf21996so15670078pju.2 for ; Sun, 15 May 2022 15:17:54 -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=fmYtWUtlLqwGf4gpB+bIPlfeR7U1GpesDtTgYJERKgM=; b=WAyQU0sBm+huiWuRBtTPIgMESaZnJA4q/a7OPuQSSh7FqOt2Pw8nhspf+KEvcWA1OJ 8q8Bfke0vhHDeNwtta5FIxOHOaVHe1ChKY0fzONa9opZvE2pNttZeIAfIdsfbd064gl9 J68AzD1Uy+u5gd5//P+goldWpgSTtF0zphoqaSoOsoOwDmJ9o/c/qSOn4Mi2KLyC/5Af SWcgRN0VMXzvcPVoXLEwSFOekFVlpFSYS766q6IXrbvGYeXgy3ay5lQTwxwjz4NXI1wg jN6c1cn3oiNSO1H+ROHqEmwxM8G5jJ4lX/MbBFzkxcZ36T7db6tbBuUHM39BcM9FXNz1 OFIw== 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=fmYtWUtlLqwGf4gpB+bIPlfeR7U1GpesDtTgYJERKgM=; b=jpDWymny+ZwCSOHabY3o2fLgzzpI55BFk3whHOic6rv/d7XeVKJpD7bRFhiQlPVHm6 oSG8BjYyuR4ghjsxrY7GrsVijtpoaFsdORum+GIJLmCSDUxjergZydCulNNcuJYCNrH5 0JKhQ708Bps98Ht90hBj2vjlVOPTKDwEo5PwAhBtRp5/RrC9PO/Q0yNqZBxbIaBjfzUB x2yI4L9bGxVy2YdO8WoiCiFf3jI7ND6Cb1tmuw+bOazdMD18I7Guuc/BGrX1teGxpmCB vVK6USYpvpsZL5xliLER9lrkvrf4OOUCvig7QpFZlspPwQGWFbfXMvviFg0lLl4N0O+S BXVg== X-Gm-Message-State: AOAM532BkXxz6oRqmzEeAnOLXshbTM8RL0mtXTxr3BW32MUBIQBZ1Vim krzBX8ooxeARsytcr2GuMThSLF0kpFFxUg== X-Received: by 2002:a17:90a:d308:b0:1dc:eff1:d74e with SMTP id p8-20020a17090ad30800b001dceff1d74emr16163702pju.109.1652653073281; Sun, 15 May 2022 15:17:53 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id u13-20020a170903124d00b0015e8d4eb248sm5640740plh.146.2022.05.15.15.17.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 May 2022 15:17:52 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sun, 15 May 2022 22:17:50 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 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: NNEf3WRaXT5M From: softworkz Signed-off-by: softworkz --- libavutil/file_open.c | 2 +- libavutil/wchar_filename.h | 156 +++++++++++++++++++++++++++++++++++++ 2 files changed, 157 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..78e7dd47d7 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,162 @@ 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) +{ + 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; +} + +/** + * 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(). + * 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; + + if (len < 2) + return 0; + + /* We're skipping the check IsPartiallyQualified() because + * we know we have called GetFullPathNameW() already, also + * we don't check IsDevice() because device paths are not + * allowed to be long paths and we're calling this only + * for long paths. + */ + if (path_w[0] == L'\\' && path_w[1] == L'\\') { + // The length of unc_prefix is 6 plus 1 for terminating zeros + 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 { + // 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 (>= 260) 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 >= 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 */ From patchwork Sun May 15 22:17:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35783 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1281605pzb; Sun, 15 May 2022 15:18:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUToUN2oZz1hDYcodJKef+CxdjWNIDV42n2/fu7Z/TdHqZXdQh7S3oNRCjbxOLxNVySq+r X-Received: by 2002:a05:6402:50d1:b0:42a:2e52:c286 with SMTP id h17-20020a05640250d100b0042a2e52c286mr10402555edb.390.1652653098712; Sun, 15 May 2022 15:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652653098; cv=none; d=google.com; s=arc-20160816; b=mji3m5cmj9fqqjNs85c7vagw+udKa/4dSjmVnaEGPAcH6ohSZf7gqk+gNvfLmP7Vvm cquB/9E3l5XKJJ/mJwLSkU1TSvNnSGspDdR3udCYkOCx0B8C4bPAeJJLEije0na8W+q5 h/HLOi1v3/S2mKbu2dKqyR4rcsNfTD1xSwnb3mOTfOGqoeth1LPKzG/h0cOY+3PgkMHf qEs4pZov3ABi6k/b7BAWC7C+kodhb4iSJqSNMM504yJwMbwS1mdFo4rCd0GluTjhsv85 9NawCMBKV6eUVX6O8PLLNK6ObImjCiaIIz7kD04zlIQFdI2R2u88EX9nrfuXaBYHk1r2 og0w== 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=wub3M9XzZocpUZ/13F+wITO/qwzidOYWXkSQsh+9jr3tV0A9lDSCheDpMMyx8Op5RC bL3tp+nM8KfI8mwR5/vZiD6Go7RusJEBrP5/KxF7RCCxfTqdIY4rRFcAtW3hn0bfFrMz AqWt+tDCq8X4y0lrlGVFVjuX+lsnZRQsvcO+vJTh6Qz0zei9eURZ7pe7CpZgoAayX/BI 70fSUyQgxjXJ0DKsGbOn+OducOLTx/Yw2u1MVW8edX5TyTj3YeR3GpJLW1vefB15ivZ/ xcBErkEgg2uS8ODIn40AOusYi20kcsSdUUQmvr2dpIU0sHR92bc9mTy9zSQdT3WpWxeU johw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=V5iyyjGS; 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 gb2-20020a170907960200b006e897db2df4si9769675ejc.155.2022.05.15.15.18.18; Sun, 15 May 2022 15:18:18 -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=V5iyyjGS; 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 4323C68B4EA; Mon, 16 May 2022 01:18:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01CB168B4F0 for ; Mon, 16 May 2022 01:17:55 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id i24so12455814pfa.7 for ; Sun, 15 May 2022 15:17: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=0gVA2fKvCnahMCkE6ckhkQ1B2TquPH11Uf6lOPzeTB4=; b=V5iyyjGSnIKUpDSJ8llrfCIdmrWym2nRoWZX5LYirp3T8M+GBR/oNSiaJHjVIpM49u W1on6uGG2jQI2zntx8CTifxfdVML6mmpFMHqiyO4pcKApD6BE5t0WkJXjTqNsuoZ0rJq oNjKI5odlZ/Azkn/zwC9+azOGSL7WPg4dFEIRAQj/AL38115SSVOOhSn+8KCA6hMK0bK bs3igES7JewCxYnGKYz8JwKNcc1+TX4R3oYt9d7H2gKrz0zt36YHHNPZYYRNasAc/q44 dJPZgDGuS/6jZvnpggLjpUFntvOttW75zvCTHoAu6GlbtoVxcjqFnPwQ8pVCm7+stNUT sHjQ== 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=GGhu0uSvT5i/JG2Jn89X5hPk+eYpyNnvHdYiZNxfWo6h17ZxgY3Xv9GK5ON0jIRTnG VFS4TA2yv0SF/wGh+EPfEhFDkDacKEQrSszs7CPcrITz9o5I4eQYRJc5BWrS/IQhQqW/ LStCZoI2dGdk9M9rPb4ZmwiEzgvtdm+8cKSPQU6//zYostSTSq/yWLxaLJphjd43Ez7y HnuaNu0bEf7a7tb2JYzGKgaxnlAwKJukV/k1u+kqeEVQ48vgY1XRbnFeVkuhweI221Yj 05+hW3tERoIhEH34qLcvSySu0mKUJrpzdsyVql0deg+wtRgRzjNX5JOH3OzJjK7UYqWw qLIw== X-Gm-Message-State: AOAM531REktzos26ppQVkOletgkTOEzvm5ewUaY/5ubukeXYMGDlFq0B 7FvE76Rmow3v7UbShZDnLJpcvBkmn281cw== X-Received: by 2002:a63:125e:0:b0:3f2:5b13:5aac with SMTP id 30-20020a63125e000000b003f25b135aacmr4402807pgs.401.1652653074249; Sun, 15 May 2022 15:17:54 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id n9-20020a17090a928900b001d7d8b33121sm2748545pjo.5.2022.05.15.15.17.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 May 2022 15:17:53 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <8ecbafe2b73c36974483f9dfe58ccf3e573ad68c.1652653071.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sun, 15 May 2022 22:17:51 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 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: w6j3xRvr5GkJ 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; }