From patchwork Mon Feb 14 09:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5361091nkb; Mon, 14 Feb 2022 01:52:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyC3P3zBRcHnaE3IJSHxnwk3Ru7IXYTdP0QsO24oeJF064IP7HrB3TUNZWhlp7VkimFtv6W X-Received: by 2002:a17:906:7387:: with SMTP id f7mr9802596ejl.742.1644832326977; Mon, 14 Feb 2022 01:52:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644832326; cv=none; d=google.com; s=arc-20160816; b=ZTDlVeRY4Ofgqx2BS3RD9GspVr64wx0V0QjhIx5OdFVjUIc+/7PDbfOQlJKlOc9mTw dKbqHUV/YNQU4BH4KJEpvhcUPBbMgXBo54NYwK7yRf56V2NQHVaiJHMrh1wqjyCohbUC rhswMAdCbbI9xnrrGeNlEDIA13YeoycxmFAi4loOAi51yPCvDj8skN4rMtoSafvRycXK ZhTrOE3R2t4iT2JwJD+2kqcyl9wmRYTlNaMTQf05B3Z8bKmMUh94chQ2nR8/g2eHc4qF V0EsS98kcGaVTF6tjNl3XrAYQUpimTFozadwJ2RkhuhkdhKdd+qxFGPFkgIdq9xT7ZtG qWQg== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=eGGN3GedTDb1Rca/fEGnnaEWGhtdK4G3WKjnnD22pEo=; b=i5r5NSK9MOSvhSVa/qhmnQlrsq6ovMxdldIWHITn8UxREQYKnUKbPb4PID7kFLz+Sp NnSXDtXctacAx5G3VzEbKvdS8E8W37Xgj0kLG/RwDjs+ytNBN+NWfW/QN9hZKksQ1DHJ UfQCfFvoE7pmGa6N0dsHuiSg/o8dBIdPerb+crCj66qsOzYfquqOBREMokW+MDep/l6p Ydr8GNwpobiY4XwiK2jYjMLSwKc3BvxucC08Q8lqk94DgNyfmH7qM16z7S/LenUkiWuF qhkZ1SLa1ma9h1O24ErCZ1ARWSsZvAEhs+eFj6rioZCsA0sOQN7C6IES5kOdkvXfvj07 F2Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=PHH0DMzs; 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=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds12si115998ejc.722.2022.02.14.01.52.06; Mon, 14 Feb 2022 01:52:06 -0800 (PST) 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=@mailo.com header.s=mailo header.b=PHH0DMzs; 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=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D977868B0F9; Mon, 14 Feb 2022 11:52:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 894A768AF87 for ; Mon, 14 Feb 2022 11:51:54 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1644832313; bh=E2+mzhGWrMEThAJM00TiwtU4kYRKILe7BSVi6kjWAYg=; h=X-EA-Auth:From:To:Cc:Subject:Date:Message-Id:X-Mailer: MIME-Version:Content-Transfer-Encoding; b=PHH0DMzsdd4vbdCgzNoINAWdyUaIwj1FHrsOr5h+fhZs/E0Iu5DX2P8aZnufYS4Dm 3YU9PF2VPsXSn0NVyinVToM01z7WZukJcWUZ3OwdGniQ1Whb980DPKTyMiDIaQodUC Y213L0Z105rvzXgxgRprGU2sdz/Qbh0LeHZHuVUE= Received: by b-2.in.mailobj.net [192.168.90.12] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 14 Feb 2022 10:51:53 +0100 (CET) X-EA-Auth: 34Rbd3Gc7zv2PitmrKrT6wqaCl697VECQS/MynRO950GGpzRM6RaLRM033u5xOo4VBnciC0Ed5DDKEFcDsns7PQu1HQ9z3RnYxXz+acWm0o= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Feb 2022 12:51:46 +0300 Message-Id: <20220214095146.13432-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] Long path support for Windows (fixes #8885) 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: nihil-admirari <50202386+nihil-admirari@users.noreply.github.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zZtjW96OMz3j From: nihil-admirari <50202386+nihil-admirari@users.noreply.github.com> Long path support is enabled by adding a manifest to all of fftools. MAX_PATH-sized buffers are replaced with dynamically sized ones. --- compat/w32dlfcn.h | 61 +++++++++++++++++++++++++++----- fftools/Makefile | 5 +++ fftools/cmdutils.c | 31 ++++++++++++---- fftools/long_paths_utf8.manifest | 12 +++++++ fftools/long_paths_utf8.rc | 3 ++ libavformat/avisynth.c | 10 +++--- libavutil/wchar_filename.h | 37 +++++++++++++++++++ 7 files changed, 139 insertions(+), 20 deletions(-) create mode 100644 fftools/long_paths_utf8.manifest create mode 100644 fftools/long_paths_utf8.rc diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94ef..ba2330a 100644 --- a/compat/w32dlfcn.h +++ b/compat/w32dlfcn.h @@ -25,6 +25,30 @@ #if (_WIN32_WINNT < 0x0602) || HAVE_WINRT #include "libavutil/wchar_filename.h" #endif + +static inline wchar_t *get_module_filename(const HMODULE module) +{ + wchar_t *path = NULL; + int path_size = 0, path_len = 0; + + do { + path_size = path_size ? 1.5 * path_size : MAX_PATH; + wchar_t *new_path = av_realloc_array(path, path_size, sizeof *path); + if (!new_path) { + av_free(path); + return NULL; + } + path = new_path; + path_len = GetModuleFileNameW(module, path, path_size); + } while (path_len && path_size <= 32768 && path_size <= path_len); + + if (!path_len) { + av_free(path); + return NULL; + } + return path; +} + /** * Safe function used to open dynamic libs. This attempts to improve program security * by removing the current directory from the dll search path. Only dll's found in the @@ -38,24 +62,43 @@ static inline HMODULE win32_dlopen(const char *name) // Need to check if KB2533623 is available if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) { HMODULE module = NULL; - wchar_t *path = NULL, *name_w = NULL; - DWORD pathlen; + wchar_t *path = NULL, *new_path = NULL, *name_w = NULL; + DWORD pathlen, pathsize, namelen; if (utf8towchar(name, &name_w)) goto exit; - path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t)); + namelen = wcslen(name_w); // Try local directory first - pathlen = GetModuleFileNameW(NULL, path, MAX_PATH); - pathlen = wcsrchr(path, '\\') - path; - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + path = get_module_filename(NULL); + if (!path) + goto exit; + new_path = wcsrchr(path, '\\'); + if (!new_path) + goto exit; + pathlen = new_path - path; + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) goto exit; - path[pathlen] = '\\'; + path = new_path; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (module == NULL) { // Next try System32 directory - pathlen = GetSystemDirectoryW(path, MAX_PATH); - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) goto exit; + if (pathlen + namelen + 2 > pathsize) { + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; + // The buffer might have been not enough for system directory + // in the first place. + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) + goto exit; + } path[pathlen] = '\\'; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); diff --git a/fftools/Makefile b/fftools/Makefile index da42078..53438b6 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -11,6 +11,11 @@ ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) OBJS-ffmpeg += fftools/ffmpeg_opt.o fftools/ffmpeg_filter.o fftools/ffmpeg_hw.o +# Windows resource files +OBJS-ffmpeg-$(HAVE_GNU_WINDRES) += fftools/long_paths_utf8.o +OBJS-ffplay-$(HAVE_GNU_WINDRES) += fftools/long_paths_utf8.o +OBJS-ffprobe-$(HAVE_GNU_WINDRES) += fftools/long_paths_utf8.o + define DOFFTOOL OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes) $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15..ea78897 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -62,6 +62,7 @@ #endif #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif static int init_report(const char *env); @@ -2065,6 +2066,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + char *datadir = NULL; +#endif const char *base[3] = { getenv("FFMPEG_DATADIR"), getenv("HOME"), FFMPEG_DATADIR, }; @@ -2074,19 +2078,31 @@ FILE *get_preset_file(char *filename, size_t filename_size, f = fopen(filename, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) - char datadir[MAX_PATH], *ls; + wchar_t *datadir_w = get_module_filename(NULL); base[2] = NULL; - if (GetModuleFileNameA(GetModuleHandleA(NULL), datadir, sizeof(datadir) - 1)) + if (wchartoansi(datadir_w, &datadir)) + datadir = NULL; + av_free(datadir_w); + + if (datadir) { - for (ls = datadir; ls < datadir + strlen(datadir); ls++) + char *ls; + for (ls = datadir; *ls; ls++) if (*ls == '\\') *ls = '/'; if (ls = strrchr(datadir, '/')) { - *ls = 0; - strncat(datadir, "/ffpresets", sizeof(datadir) - 1 - strlen(datadir)); - base[2] = datadir; + const int datadir_len = ls - datadir; + const int desired_size = datadir_len + strlen("/ffpresets") + 1; + char *new_datadir = av_realloc_array( + datadir, desired_size, sizeof *datadir); + if (new_datadir) { + datadir = new_datadir; + datadir[datadir_len] = 0; + strncat(datadir, "/ffpresets", desired_size - 1 - datadir_len); + base[2] = datadir; + } } } #endif @@ -2106,6 +2122,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; } diff --git a/fftools/long_paths_utf8.manifest b/fftools/long_paths_utf8.manifest new file mode 100644 index 0000000..d1ac1e4 --- /dev/null +++ b/fftools/long_paths_utf8.manifest @@ -0,0 +1,12 @@ + + + + + + + true + UTF-8 + + + diff --git a/fftools/long_paths_utf8.rc b/fftools/long_paths_utf8.rc new file mode 100644 index 0000000..f33de76 --- /dev/null +++ b/fftools/long_paths_utf8.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "long_paths_utf8.manifest" diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8bc3986..1468921 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -36,6 +36,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -806,8 +807,7 @@ static int avisynth_open_file(AVFormatContext *s) AVS_Value arg, val; int ret; #ifdef _WIN32 - char filename_ansi[MAX_PATH * 4]; - wchar_t filename_wc[MAX_PATH * 4]; + char *filename_ansi = NULL; #endif if (ret = avisynth_context_create(s)) @@ -815,10 +815,10 @@ static int avisynth_open_file(AVFormatContext *s) #ifdef _WIN32 /* Convert UTF-8 to ANSI code page */ - MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4); - WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi, - MAX_PATH * 4, NULL, NULL); + if (utf8toansi(s->url, &filename_ansi)) + goto fail; arg = avs_new_value_string(filename_ansi); + av_free(filename_ansi); #else arg = avs_new_value_string(s->url); #endif diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..32260a4 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,43 @@ 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; } + +av_warn_unused_result +static inline int wchartoansi(const wchar_t *filename_w, char **filename) +{ + const int num_chars = WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = (char *)av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +av_warn_unused_result +static inline int utf8toansi(const char *filename_utf8, char **filename) +{ + wchar_t *filename_w = NULL; + int ret = -1; + if (utf8towchar(filename_utf8, &filename_w)) + return -1; + + if (!filename_w) { + *filename = NULL; + return 0; + } + + ret = wchartoansi(filename_w, filename); + av_free(filename_w); + return ret; +} #endif #endif /* AVUTIL_WCHAR_FILENAME_H */