From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 21141419F9 for ; Wed, 16 Feb 2022 16:08:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DDDF68B276; Wed, 16 Feb 2022 18:08:23 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 719FF68B0DE for ; Wed, 16 Feb 2022 18:08:16 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 21GG8F1Z000571-21GG8F1a000571 for ; Wed, 16 Feb 2022 18:08:15 +0200 Received: from foo.martin.st (host-97-187.parnet.fi [77.234.97.187]) by mail9.parnet.fi (Postfix) with ESMTPS id 3D900A143E for ; Wed, 16 Feb 2022 18:08:14 +0200 (EET) Date: Wed, 16 Feb 2022 18:08:12 +0200 (EET) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <20220216150859.16844-4-nil-admirari@mailo.com> Message-ID: <2294ea3c-2be6-e33d-146e-39434c2e570@martin.st> References: <20220216150859.16844-1-nil-admirari@mailo.com> <20220216150859.16844-4-nil-admirari@mailo.com> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH v3 4/5] fftools/cmdutils.c: Replace MAX_PATH-sized buffers with dynamically sized ones 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Wed, 16 Feb 2022, nihil-admirari wrote: > --- > fftools/cmdutils.c | 31 +++++++++++++++++++++++++------ > 1 file changed, 25 insertions(+), 6 deletions(-) > > 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; Why would you use ansi here? Aren't all internal char based paths supposed to be UTF-8, unless passing them to an external API that expects e.g. ACP paths? // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".