From patchwork Thu Jun 9 19:04:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp542313pzj; Thu, 9 Jun 2022 12:04:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBbrl3deoeyD7QZxYBiThiFEXUPtRxQ6ZWtzJqcBBu/jAWfsFPmFsvzqeUUXLanw7EkTTZ X-Received: by 2002:a17:906:7a0b:b0:712:e5:6bbe with SMTP id d11-20020a1709067a0b00b0071200e56bbemr5506492ejo.640.1654801474764; Thu, 09 Jun 2022 12:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654801474; cv=none; d=google.com; s=arc-20160816; b=wMbe8CtH3eGEgnwIRCen0DeNApm8MvbaHbQxJIeph3HRV09ESraIcAat8PY+7y0nHG TqL96YTbsyR7d9ipcAGXewDyVcL0WLQGD8YUVuijM7n1wh1L5qh+xr89/hyU1IykUc4L ehiL2Mcbjwb6J5xrmuJodNah7x7NKU3s6fml5kE1hE4JtJZD2hYnRDUuv/18ClCRIm5v 8t01faN6Yma0P4vJzB7bfRQjGw9UYhbMsaZ1L0htkW4qi43fPkOXGbNmtKPmCk2aM9xf 4DRUVW5DzBhZZ8StEd3RdnKLfp+oqyyrMcBamZsgTNR9wXcM+k/GW7kxQBRhBWDcAsD2 559w== 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=VN2gD1c0OeGWpLQM2sbDG79/slisozFp7EM6Csn6xZGycjAP+cdqpTiEmrmxg45meD r5EabH+3XEk28O/F1fKoRxmxRysX1buBtlnjH8cLuS+jAq+yqus2Yuhp72/gVH8yeFia UyVJMlHlzRvb5xWU5t22wmBppguV14C5E5Ow79femBHbEuBJUAQFNsVClYs6Diy0vMWt D5iH9UEX28HlMzzuAkigX/UMb4s+eieDnZhrzX6bVaOmfixZigj03E3lAWDwdIceGX+n he5RfB0trFXfjsSpZ1ZfMqA4OzD7w2tvy8locuzq4W0/pG8c+CvgiMDbpIa39/ERigTa yqgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=GOlci+DG; 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 b9-20020a056402084900b0042aed1df374si2334881edz.308.2022.06.09.12.04.33; Thu, 09 Jun 2022 12:04:34 -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=GOlci+DG; 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 6087F68B79A; Thu, 9 Jun 2022 22:04:23 +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 DD0A268B73D for ; Thu, 9 Jun 2022 22:04:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654801454; 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=GOlci+DGEK0Xm4rbfN187Q+v9269zQFoNtI3E7ptoZ75CVEDi5P6gpG1mGbOCg81Q mxUd7Wkw+Qux41sFT8mE2KvpEEfSbOLYD3xeyYmBpnnYJxC90wcxXJS7gcbooesZIv awvdUOtzaOIKSzhnUKETVtYTiKCJT+Nm9ZDNi2c4= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Thu, 9 Jun 2022 21:04:14 +0200 (CEST) X-EA-Auth: tBqrC0VmZOZ09bV1lHZpKRaraT1ZKMUL9TEFMhjGcxwg/65bxcuqahW2xWlY9DKA2FN73YDVgeYOW+QE1SlNnQIAXztONlrkhYHLDsdAoX4= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jun 2022 22:04:05 +0300 Message-Id: <20220609190406.6339-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220609190406.6339-1-nil-admirari@mailo.com> References: <20220609190406.6339-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 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: KhZiR0qbRfdf --- 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)