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; }