From patchwork Sun Jun 5 11:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652156pzj; Sun, 5 Jun 2022 04:36:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0HH3CUbmFIEut8XFvhGKQoZ+hqOJivpcqbdmbQWyPenDT1PhomBxjjbDqKGET94+R/Ccw X-Received: by 2002:a05:6402:42c6:b0:42d:ed84:6fe0 with SMTP id i6-20020a05640242c600b0042ded846fe0mr20746542edc.58.1654428960736; Sun, 05 Jun 2022 04:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428960; cv=none; d=google.com; s=arc-20160816; b=NH3GWss19EzIuUsMSaiXCQ8xuigSuPCtPFx15plJkdvf6wWTOLjD4eVyGJ+/qlENUO 8IPI8EdqsXoHGJwyIJq0jv/6CigM5G8klSZfjQ3dH3mpJ3LhU+SDNZDY52EsvZHAfD7j N865Mfzxs0mZbNjqbqKTHRR7/kqPlxSBMSYxZVF5Qadycd+yJFFe2OAY9q49A+KvGZQv KQRDmTl0A4GW2bO+PnsXED4Em5YACE4gvBoiBAdO3EJE8uoMATFkwWEl6wrsxEPsEQQk 1lWvCd52qFMIo3pGB04c0UhfAtFwUPjjdrkWfBV9e+oVFxT5sDORtEZSP7XyjXK1Cd5w 4Jsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=BBW3nq6ycSdmNkxU6a1PyNAzvxHobPMaaSVswi/UvVI=; b=tqghAbuxooyV0ZKSkFqoi/YDl4HhJj7OVxNvmd4cP4vPjKcP/wuweMxix8C+BZUYtE G8CFFHLoPajZD9ctAn7WiRAO5pR1TraKDuWjnUY6o5Ma3potaOOoAgXSkJhL9WUDbybw VbrwkxHb4QaUAobM5SpsGwLUCqscmmWjSoQb0SN2+32YxGm9oKi5S3n4LbnuJTbNvYR5 DSdyYhwDrUnWaFALBkMxV31CbSpszOYAPSszGTS0KYWpFn3Ej5EyUDxpuOH9hsHKV5Xv 1P+RL0eJrfXJJwbZVf0Y7vnIXl6pidJC5ROZyoCavqSiJTN6SAF89fFaqflpHb7J2X4p aI2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Nt9hUewZ; 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 x8-20020a05640226c800b0042b5724a3bcsi14823212edd.21.2022.06.05.04.36.00; Sun, 05 Jun 2022 04:36:00 -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=@mailo.com header.s=mailo header.b=Nt9hUewZ; 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 175BD68B616; Sun, 5 Jun 2022 14:35:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1580E68B4D2 for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428949; bh=JVJysR3sN2mI5dLrMpXNS4Jpx4W+YMdMGFmklfp6HUg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=Nt9hUewZji5Q8+EcCUTSMPH2sdVvOqYvxXD4SKEevOI9xuY1wORiSAwY3zZvyw6sm K+ULqVg4TNvqB98I5r4arz7dJrrd87f8+TcTi8Zp4Oa5QKqwKT4PyrRHV3mS2IiyhP HyAGUP15R80D2M2GxNTWuL/Mptwp+gK2jeIUvEME= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:49 +0200 (CEST) X-EA-Auth: 4ZLdw/dNTXJIgyTC8MeIx7Uko1czzMJPVMT1wnPNGMm+tLhW0UVUsjd0ghyZwueP308wUWQhRYTgnR0HnO6AkkuwS0QLYjAcXUVAu8uK/7o= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:39 +0300 Message-Id: <20220605113542.12280-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 1/4] libavutil/wchar_filename.h: Add whcartoutf8, wchartoansi and utf8toansi 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0vukXg1Vhfu9 These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c to remove MAX_PATH limit. --- libavutil/wchar_filename.h | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..c0e5d47 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,57 @@ 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 wchartocp(unsigned int code_page, const wchar_t *filename_w, + char **filename) +{ + DWORD flags = code_page == CP_UTF8 ? MB_ERR_INVALID_CHARS : 0; + int num_chars = WideCharToMultiByte(code_page, flags, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(code_page, flags, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +av_warn_unused_result +static inline int wchartoutf8(const wchar_t *filename_w, char **filename) +{ + return wchartocp(CP_UTF8, filename_w, filename); +} + +av_warn_unused_result +static inline int wchartoansi(const wchar_t *filename_w, char **filename) +{ + return wchartocp(CP_ACP, filename_w, filename); +} + +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 */ From patchwork Sun Jun 5 11:35:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652273pzj; Sun, 5 Jun 2022 04:36:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhmK4NFy4NCRPtyHTTF4YmRbCfjNllPnjEWmQ2RsU1cmTvh9ovcJFC/sYVT8wpjg7CK5Tg X-Received: by 2002:a17:906:4356:b0:711:cd0d:b205 with SMTP id z22-20020a170906435600b00711cd0db205mr978179ejm.240.1654428977858; Sun, 05 Jun 2022 04:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428977; cv=none; d=google.com; s=arc-20160816; b=yYyJ131Yk/tVvgwASfzx/Y53R/JtChuCkR2SPM7pc7zfvRHBXPTIg8t8t3f7UqtiNx qpIDQ4Q6tLIQjXXk/wWqWEgx/xUeWC69VMDGa1cLvoEl3t+XO0Ese/W9QvfjhKbHpWtT 3EK+PZo6Dph59xbyDMTYd13R2i4WtSNJuEOnTQTdGcnHI9wGp/Ka7EgRl3ZNRDkkwi7w CtlpFwERfUrWmRVLS3Qa7hFsGKdtf1GWrmGA9dYjA8M0Fw+nYr33YHIX4jLa2lxtSPLK PL+cLQWR4YxcuSTlKEXUXNfEqc4ey95OE+FKgolR50Sz0ddvokfBY3CpOeFL28SUNU71 a0rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=aYmxMYrs3hJCZadOTVhZJFh48qqDpc5LXl/qTcjn3VA=; b=NfoqIpz6Mom/N56CvfZgD+XMQjG1Oi/2TnyNuQj268MmJz+BmFbIqHDdSFOBN3blCE qHsAbLEFr/X6WTgtPjPxYu615ZlcmFLfPw/C1p1+DppYgGlkeyT0iKTA94DBeKUZspZ3 0lXez/rcuIy0+CBVVmo88+oxbzVMlkucCoZjtLsmEoP9JBP4IpQBxi2w50lJVOEioXDV SUDiE7r8ud3paDklAuSB5uAA9FMiF/ikv4qewaromHB9eDr3dReoc6dUDnQlyyX7QD+c Zhb8aPScBsHdAIUFi2tg1RHxyw62x6jh1mZOaajiZch9+nK6uQ1p2BqmEW/KJgwQolXw 7Ukw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="kHzaa1//"; 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 z14-20020a056402274e00b0042df4f079c0si16767200edd.383.2022.06.05.04.36.16; Sun, 05 Jun 2022 04:36:17 -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=@mailo.com header.s=mailo header.b="kHzaa1//"; 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 17CB368B646; Sun, 5 Jun 2022 14:36:00 +0300 (EEST) 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 27B6268B527 for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428950; bh=mpaN5hOKH8Aw9kq9HUTODy73YmSm0a0YmTPV45fwKD0=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=kHzaa1//CiJLx+CneG09gdCYITlWWDEzyOHxWTo9oQ02z1cTd+W5TGQ83fuljkko+ 2nHJ5OLfIOEKTcW4tZ6lYTw98eIloI77YvOUYqU948nmC99lMQ+dYkqk/VKfmfF0LJ VyMjdNfZo/plTPW1MSg8Zu78cmLRWT2xBjzB4sHc= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:50 +0200 (CEST) X-EA-Auth: +40tETL3C4S2E47i3pjUTX2Lxi8TAvvXg8Rh+SG+wmiVuw7YiFWqrI7xjWBVso8ocVNKcm88ncw+0r8jAwrVXundMBK4wt2Z2K1MOawT4Vw= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:40 +0300 Message-Id: <20220605113542.12280-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605113542.12280-1-nil-admirari@mailo.com> References: <20220605113542.12280-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 2/4] libavformat/avisynth.c: Remove MAX_PATH limit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 13cKJE9rPdU+ --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8ba2bde..f7bea8c 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -34,6 +34,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -810,8 +811,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)) @@ -819,10 +819,12 @@ 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)) { + ret = AVERROR_UNKNOWN; + goto fail; + } arg = avs_new_value_string(filename_ansi); + av_free(filename_ansi); #else arg = avs_new_value_string(s->url); #endif From patchwork Sun Jun 5 11:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652224pzj; Sun, 5 Jun 2022 04:36:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygKdOKQ2caG5ZIzaIionCoJZFHukaNphIzcqkQWtahBSvmuYT4OW93KALoQxTTer91v7BC X-Received: by 2002:a17:906:7254:b0:6fe:5637:cbe6 with SMTP id n20-20020a170906725400b006fe5637cbe6mr16716901ejk.612.1654428968650; Sun, 05 Jun 2022 04:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428968; cv=none; d=google.com; s=arc-20160816; b=ZeW9r9h02Gx4CV+0SXjq71tzYOk7KjKJnf1aV9OlZjzPdI2hTNSEhL+4u0ii9IFf+c GJGteV7ev2jO8lyCflKpJ1VeLKJV/1X2l4LJY86CglqGpjc4ntsaPTT3Anr0WWegv6UH cGA7fUjTUpQ88dc7TwSLCWli1jVTqpCDjut4nTKQ+kbgoQbZjsPGR9u3xVk1lv9oe5up 60n8ZOezcTQC8h5nszN+QSYTGKx8fj/2EO5IIQOXQ9w7Kpm17JyjqufB1ejvR84zWwpE nZ5reilCYw88yT52DLguqeyOtRn4/WJKZHSKc6/9aAHO44jhTHtB8higLvdDNg/HRXKp bJuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=kchZNjAoPI1D76eQGAQAHeEZQbrsmpYFNuq+LvY8BCw=; b=v6pQTNNqIBUhQ/a9glgooevkPghwmJgHl5wdlrwcguUDqNnd8uLu8zNXxpNM1udSDy nnG+270OXzbvTadQIjTDhWGiHTorxoFzSHFGaaTTGYswPN+TN9cePlEcpDhXhBpwcu5r CAMLiLn2uCMcqSXSVua4G2UslkgyqZ3S2gNv9ZGiblt3kY61rskPr+SVkGg5hWWKNjMY 5KjnA4aj7kbWifc/LIMsYTtvdsxqibhIhsjGFPUiz4Hbsk3Ock2YhjpEGIeEvf+3033m G2e2+a7roj+a4/BmQ4PGYrdZWesMH9BlzhQmaTNyGUBKl1H/jNI7H3t4CceyD7AkqCRn blMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=j2bDCNbW; 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 si6-20020a170906cec600b006ffa19a00c8si3206503ejb.184.2022.06.05.04.36.08; Sun, 05 Jun 2022 04:36:08 -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=@mailo.com header.s=mailo header.b=j2bDCNbW; 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 0001468B4D2; Sun, 5 Jun 2022 14:35:58 +0300 (EEST) 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 28B7B68B5BD for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428951; bh=2cGYK/mQD9DIV+tlqEuWkbmDiY38A53odPccVCTf4Lk=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=j2bDCNbWJCoKF4Dyr1yR7KELxlxehalATpMucbKLi8302ymzH/vU00rx6ttEjnHM5 MKuJlleWPuDl8JiOmYb00AgvA2fLdUWisA2eKnXhhyNDmAHd/VvJ0U2QqITFukDfp/ BZFlM1lQA8hMjy7980X+loxR1AUrShAWGW9hoSsI= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:51 +0200 (CEST) X-EA-Auth: cVv8xnsTvN7CEnzJ70XcitKlW/0jYZLowcvazg/sCgPENJt5ehLivkQn21HAqerPzrlsC+rKuACy9ByU+v2yKNRDUFpk4uCu25o3QpNkAi8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:41 +0300 Message-Id: <20220605113542.12280-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605113542.12280-1-nil-admirari@mailo.com> References: <20220605113542.12280-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 3/4] compat/w32dlfcn.h: Remove MAX_PATH limit and replace LoadLibraryExA with LoadLibraryExW 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B0RfzVENjQBT --- compat/w32dlfcn.h | 80 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 16 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94ef..6b0dd7d 100644 --- a/compat/w32dlfcn.h +++ b/compat/w32dlfcn.h @@ -22,9 +22,31 @@ #ifdef _WIN32 #include #include "config.h" -#if (_WIN32_WINNT < 0x0602) || HAVE_WINRT #include "libavutil/wchar_filename.h" -#endif + +static inline wchar_t *get_module_filename(HMODULE module) +{ + wchar_t *path = NULL, *new_path = NULL; + DWORD path_size = 0, path_len = 0; + + do { + path_size = path_size ? 2 * path_size : MAX_PATH; + 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 @@ -34,29 +56,53 @@ */ static inline HMODULE win32_dlopen(const char *name) { + wchar_t *name_w = NULL; + if (utf8towchar(name, &name_w)) + name_w = NULL; #if _WIN32_WINNT < 0x0602 // 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; - if (utf8towchar(name, &name_w)) + wchar_t *path = NULL, *new_path = NULL; + DWORD pathlen, pathsize, namelen; + if (!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; - path[pathlen] = '\\'; + 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 = 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; - path[pathlen] = '\\'; + // Buffer is not enough in two cases: + // 1. system directory + \ + module name + // 2. system directory even without module name. + 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; + // Query again to handle case #2. + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) + goto exit; + } + path[pathlen] = L'\\'; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); } @@ -73,15 +119,17 @@ exit: # define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 #endif #if HAVE_WINRT - wchar_t *name_w = NULL; int ret; - if (utf8towchar(name, &name_w)) + if (!name_w) return NULL; ret = LoadPackagedLibrary(name_w, 0); av_free(name_w); return ret; #else - return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + /* filename may be be in CP_ACP */ + if (!name_w) + return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + return LoadLibraryExW(name_w, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); #endif } #define dlopen(name, flags) win32_dlopen(name) From patchwork Sun Jun 5 11:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652319pzj; Sun, 5 Jun 2022 04:36:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVqrcrH0fMoWrwabvpqGNxiwNfXkOV7dkeE/gGttMcX/+EBEMeaFJzsdVlkuSiXs45xuy8 X-Received: by 2002:a17:906:c797:b0:711:8c01:32d4 with SMTP id cw23-20020a170906c79700b007118c0132d4mr3732799ejb.205.1654428985865; Sun, 05 Jun 2022 04:36:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428985; cv=none; d=google.com; s=arc-20160816; b=euL41sMiws4esahTr4TZLLZ1GgdHITCaUfTYE9OqNbhK2amxV+a5596cjJU/HjpAZn faWP2aLWWCVJFkcrNHIl7GPW7eO2VhXIl7jcGxN8NHygltANRMRuQcpcdxZ1+paIFZC+ 5zamkcn6yI7pkck8Qa8n821H1CTQ4pQ23zutm1R4GU3RPKaydhs7hyaGaNJRfczveSJo pHu73WpINZNXa4sGqwsrpw/i4KqtC7ovYH5Quq8jE5ywRyGdL29+XXeDaLVL8Uab9bYA 3sxx6ntBxz9nLb+ddgkqVIH2Ldrbb5KuAygRSsc4RzD0Pr8jN/A1sQ0RIwyurc85KYqJ +CnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=R0CfGy6UTozgz6Pxl8r7vUtEqtVdeiC6dcYzyZroIdg=; b=KRQ3FQXOeruJBwatOdWiS/PigRe9UY+cn/cr5W+MS8gHfaSqoe+S+ONlWU0kxL4qxw 0VtEpx3BiYUycqIWFh/v3YJc6G6aPEelezgYBE5RbaDaAfQDAbiSBOu2MUZf4FuyspyC lckJuU5spR9FVjMvKBwXI9XA2Eu00rNlO+A3L/YdQu9xvaYrbX0OzdVLL09QdanrSw5e QZBL4CpOJqWH9umfahpttw3vKKO4Nv/cclFdD+khACZ+pd47+p7y5NUtIaKpYlx46m4e R13auq8/Sy5np3ACMfWa3UYKtLOWLiKDplHeVAXNcwgTQHhL2FFY80Z0jOCzqGL8lJW2 TAfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=HAAmxLKH; 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 l17-20020a056402255100b0042fafec8901si5683988edb.130.2022.06.05.04.36.25; Sun, 05 Jun 2022 04:36:25 -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=@mailo.com header.s=mailo header.b=HAAmxLKH; 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 1626A68B654; Sun, 5 Jun 2022 14:36:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A59768B5DF for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428951; bh=Ex0XRnhO+eBaLXd0T9UAKNQ5KIO1V7L41aGOAUt7LFw=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=HAAmxLKHwcJjnzB8tdNrY2jLzMMaWbd5xX2d9MYu0VPoS42XetRQcLmFjQMbYJq4Q 3K7uNkBIRt6saD6bk/1GNx+ResUMuhedakPQTirFfqmijh03IjNCq58ZvdepNGXNH8 DHyH8sT+EcHz9z3kuejFinaH0tqseuiiioE3WhWY= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:51 +0200 (CEST) X-EA-Auth: qYxHljeM/em6YeizU0AcxX3b3vnSTJ8o2cwRLtKa/d82sb+gIlckfkCsAQK+uADCLZ6/KkDjXTr2FZKUbF2+GQ4noHcD7DZLsxLrbY5ciWQ= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:42 +0300 Message-Id: <20220605113542.12280-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605113542.12280-1-nil-admirari@mailo.com> References: <20220605113542.12280-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 4/4] fftools/cmdutils.c: Remove MAX_PATH limit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: i1TZy8OZwzIF --- fftools/cmdutils.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3..d42bb04 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -50,6 +50,7 @@ #include "opt_common.h" #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif AVDictionary *sws_dict; @@ -812,6 +813,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, }; @@ -821,19 +825,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; + ptrdiff_t datadir_len = ls - datadir; + size_t 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 @@ -853,6 +869,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; }