From patchwork Tue May 24 08:43:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35904 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp426997pzj; Tue, 24 May 2022 01:43:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRkV2u2icVlx3+3Ucn/vynFHIhwIVs/e5kbCku1eA18kXLKmh63KD9EyasYr7LqCRLEn1S X-Received: by 2002:a05:6402:288f:b0:42a:ad43:a39b with SMTP id eg15-20020a056402288f00b0042aad43a39bmr27316334edb.342.1653381833281; Tue, 24 May 2022 01:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653381833; cv=none; d=google.com; s=arc-20160816; b=bHG2VszoUX2D4Ln3G75VvC6aZcdUFn3IrYC+cm9erDj8VLoKkubOUmUfaD66f5gaoi 1wqlQJQTOPbZuHSymB0mUhDoNoZvOmiLbwPbABV01Xwi67N/TPdzOHnpWmxW3ZDJ8G/9 w5LYbEAAA1K5STpZic+th1XF26gE11C5NjTissFEP9W2ES8472cnYRAxeh0JnnSkuFZv HnckzYznitUkadDWBF2pk0DWj3w4llgD0HU6AwKbj6nDcAdFi1wQ7dtSug13B2hKNR4N UaOwCSZxc5MMZ12EQcABcOSuYYPyeCf8GR3HNh3cS9N9jKOyNnx+Ov687reGzq3CVNDH 7bmw== 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=L2JRQiz5qh3AuL7DabRLvwm6Wz54yNWBwwK3Y3udqwU=; b=HuXkWBN+gApjHCeOKTfkcLMfH7LnaXW3Sk7+S+perhCAgbja6zWttcJAm3RvMNpWrH N/HJGIQ477h7lF+GDuV2jhru3GOr50jjbtVQHVsU9ZBrU+v2sIC9v2XvqU2UdBzLXGZc G0Iat/Y/W0AtL9j1cEUVgOawbXyChPJLnQ2igPZyJJ5jASMtoGUfbRONKa9u6AjMXl5X 9CSWa+wRlTXFoCk6RmWi8pwke01bbBNVk+r+ZjJ+pRkCCsM+doBCtBiIMoV22GRauGQc yDX4W+ZA+7M0ZHCxdqD6yjby7dK5V8OLz7nV7pfP3ZF+Iajr07WZiZBsXUYlyxauyvsw RIwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LlPE7U6v; 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 dp2-20020a170906c14200b006df76385cd5si18292161ejc.373.2022.05.24.01.43.52; Tue, 24 May 2022 01:43:53 -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=LlPE7U6v; 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 911B768B537; Tue, 24 May 2022 11:43:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D799C68B18C for ; Tue, 24 May 2022 11:43:32 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id n8so15300026plh.1 for ; Tue, 24 May 2022 01:43:32 -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=5eQYN1a5jS49+JY8r5Du+pjX12CWvLpiBT443RNHNFc=; b=LlPE7U6vZJJfvu+LmipB+y0/BGPjPgFvbNO9oXKkj9Gyx7FsO0TIPkv/pfG2ihQ5Px jra8Nxcl5KQUzdEc0CYwEoA141fTOWbgD3JWeeyqgym6ldNXraBdaece/WOMTAQlFbg4 CNQbBMT2GW13mtuF3kCZwh0eTtOGYbx5WN0DdVmQDksNpF24HJM1yJnV++H88aJEOBWF BGF6VK3bdAh3WhSn1WrvLcCnd2Wd/KlU80FMOOWG2lxv0JQwhiRWbO+pD/2nJFtcs0uZ CdDs/U7WJ63YJcFKkrMTwiXP7dIYfwmBuTBhTRv2GNti4b118Hq6LNhHOK/yv6TVar2k 7cJg== 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=5eQYN1a5jS49+JY8r5Du+pjX12CWvLpiBT443RNHNFc=; b=ENcD39ENb652sOiKBUyVUOoNjbYU4gxOQml8VWpmPsjayZjYiRNNW7SXNuAtAYCk/c nvfPkGNc2AszmBtQlvudzCVwlBxB0glSBJy70X2DSQXPvKYi2TeYaDgCWhS68tOQrFFi 1dd9VaiMWDgE8U0H+l3KIELbID1abGEVJxQ6ZnU4UyzTmJrigVig/Q9Wiyv0BGOlHH0C UfJltWFyAfZozP7NCCAFRtOTCX+JFASN1I6DJm5RImpkSieZ60yrVAixDnGMLhnN0SrQ ei+nwr7L2IatatSLCjooI61jZJ9b2+XZtzcbN0j+YTqI1/F+S3SZzRFINaIqEFkC3Fg9 g74w== X-Gm-Message-State: AOAM533pJtDNkl23UF+eKz2iGbcFw5NUAtp3pGuHO435splUI67xTUUP FWUARzhHTsNbfYnR79btuSBECVAfLFHOgA== X-Received: by 2002:a17:902:7296:b0:14b:4bc6:e81 with SMTP id d22-20020a170902729600b0014b4bc60e81mr26644027pll.132.1653381811250; Tue, 24 May 2022 01:43:31 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id b19-20020a17090a551300b001d9780b7779sm1125597pji.15.2022.05.24.01.43.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2022 01:43:30 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <13118dc1faccb2e31f92dd21511b6558a6e9ab3d.1653381808.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 24 May 2022 08:43:27 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 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 , Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YKJ1zgfllfg9 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 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..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 Tue May 24 08:43:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35905 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp427058pzj; Tue, 24 May 2022 01:44:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaGcLo8dbv+PoAMBFUFvplp9Nl0vk0q8KWKLM7WEN2vmZcDHyDoLhJFCwpoiBcFPf2wghJ X-Received: by 2002:a17:907:7244:b0:6f4:b93e:58a6 with SMTP id ds4-20020a170907724400b006f4b93e58a6mr23425936ejc.543.1653381842013; Tue, 24 May 2022 01:44:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653381842; cv=none; d=google.com; s=arc-20160816; b=gnPRzL19S1M4QDeaYAY4GOXKwO3tD2KhpTojI1evrAJzUuITfW+rl9tWPcaiFZwy2M J+YMU8Gs8HxlynYK67XPvgzw6itaE+JufakahlybyX0uYBiXPEP4RbPfhzDXxfKgzOU/ I3aX0jqub7HbI1nnLgdyOzmhOKTD7Q3qGgYval0xCIgkK7YJicwdnZXicZifjUHYVBdf oJOfD7ahkAp3f05lkDxpUQoaVh0z4mJ+ty0AK8l4C0gJsWh4vh4qDTliSpBwZluh7t41 4j/id6W8laswz132lrqFQAYjGMKa1T4CGBux+V5d7gEM/db/y5BgkMXP2MJZV/TTpRCx fiiA== 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=4lGGhnQrvhE/5Bhp3b8PgMPeTiTCcVSUhTqws6omh1o=; b=AhQbpcsx6bolmnehBOxCxwzxIU5GCpkA2bEcf/u7vbkqLEebO8Lj5tPbvUs294Tngx 2eWV1I1p4MYSonUUCg1a9nU0NHx4jVhJMbyc92QtZGFvU+rJFjCM/iWvU5jZZc7+Gwox kAZWxPL3UW5Z/OsYw/XE8lOlqfTM/je24XW+LKYmdhfOZTKPia2rU3jjIVcqPNGuju4M Er3h/Zhc9Qgov9eOBBgQVejF8MsBjCcb3RyB9ge+F3+jATlRvpPWwHTw9xsiF3Uy7Er9 ZddyzdsV7xjQUI/ljbSt1rXLXJLrON/MpDrwV/yBEtcyIZ1asYaJz7I64ttgHJUDosKX 9HMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CDFjaium; 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 m10-20020aa7d34a000000b0042a4486a236si15824632edr.114.2022.05.24.01.44.01; Tue, 24 May 2022 01:44:02 -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=CDFjaium; 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 7F28C68B53F; Tue, 24 May 2022 11:43:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E725F68B52A for ; Tue, 24 May 2022 11:43:33 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id m12so15294042plb.4 for ; Tue, 24 May 2022 01:43:33 -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=Mcocx7c/oqsviSbsrznnUL26TMr3rxYWNRdcu4kbS8I=; b=CDFjaiumoQDh6kOyNy6tvWISCyDNGkx4RM8s9SXRlFB4oDGTkUrcA1mH2QJI1aMbhF Jj96qxWlkB/BIrzZ3kWyBkkSM0u88HIrY3sM+jgJwGqX0H0rB86bq7Mfi2RbR33v2wOS haoogO6uuDimm/eC0ZMMi3yYsMtlGXnYtybcRDiYTPnGtoJslTbrORioN/qHpAo+RTDo Rexr167xBzM4inDUvAE+wj1QcV+1NyJGB6cbX/w6+jBdS52FrfNV4T70d2SHN18RlG0w V0VDi3fTEfJhHQS2TTJKSWyWxXdUjoK11qiIo+F5kXB7StY3JtVxFtgjUoqA7GJq6EXw QQrw== 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=Mcocx7c/oqsviSbsrznnUL26TMr3rxYWNRdcu4kbS8I=; b=g1dmJFApgtGxTGzQAgkCG4AZ+S+rR6Ps+N/9nQGVcwwKWp3vtCdB6xpXYItLL1nU6I 4SfZnUoJlpC48I3q9qUnQm/ws5yAYtB8rebJXLUVGg66YKL8yy9I1Vku6WFlqHPdlkxJ b670uworZ/cGLop+JMBXf43/KEQR5oliIXpmK3MlY/93aoi2oSfEt6UPWbgBqiy0p4mJ b/P+OWsUE5HQR1A0ICW5MEohsTUf3wPWV56bSJDWG/WQuoOA4aJMsA43Ru85etBXKLcK Wm60PKwR6uWjJ0UNbO4YJtRT4Z8OBvkiQ5BG3gsCXmJkhJfc2tMeBILn6MmMFKkYVHmO Y5Ag== X-Gm-Message-State: AOAM531d7zDHH67vAtQrSWwB196ZfBhp69CG32D8ylou0mEbWvT4Jx+2 bERefiITTQOskNpSmtAvi9xT2GCV4hgg6Q== X-Received: by 2002:a17:903:22ce:b0:162:4b18:4f95 with SMTP id y14-20020a17090322ce00b001624b184f95mr1021090plg.122.1653381812334; Tue, 24 May 2022 01:43:32 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z24-20020aa79598000000b0050dc762818csm8731318pfj.102.2022.05.24.01.43.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2022 01:43:31 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <5313aeec0ee25dfe6255d75e37db29e436c906fb.1653381808.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 24 May 2022 08:43:28 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 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 , Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1i+tSaeSjkzH From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..d4c07803a5 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,7 +49,13 @@ # ifdef stat # undef stat # endif -# define stat _stati64 +# define stat win32_stat + + struct win32_stat + { + struct _stati64; + }; + # ifdef fstat # undef fstat # endif @@ -153,7 +159,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 +183,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 +205,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; }