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 A884B4C5B6 for ; Tue, 30 Jul 2024 14:09:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E2BB68D7AF; Tue, 30 Jul 2024 17:09:32 +0300 (EEST) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ECBC68BDE1 for ; Tue, 30 Jul 2024 17:09:24 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3683329f787so2356011f8f.1 for ; Tue, 30 Jul 2024 07:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722348558; x=1722953358; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OwlsTleMWMlLhJ5Axbh0kz3T0qisKl/O1A8anqYWcuQ=; b=H3t7CyRboIAw59QafPZgt849HDr4alB0+kAo7Mtal9xDB2Z652uPA8AmKTWFwewY2d roIeP5ZvLoXGXUzluBgZjL6r9mLy1HOX4QmcD1xu9vTCv4zzDWoIoJCJT6q/5a+LGApH gHu+Q1px9L6ONvL7Ob/t72VvcXxz0k/X8clzHAP8ddhv/+jDt8zpmR2cDJiIQszw0/Ad nT6Q7OlF1C9/8h6L2Uzt/7vd0Nhp39x4+X6O7WlXFbQOhBauIYePREpe5rbKrXSUCnx1 q7kr7/6hZWgrXWLVq02BaQIyr9axBY3xo47SVJeX4SMYEvZJREJSM6pWHWCTDpIZIR5/ Rr7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722348558; x=1722953358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OwlsTleMWMlLhJ5Axbh0kz3T0qisKl/O1A8anqYWcuQ=; b=pJMvIW9inuhsMGEtJUCsegopxqeS6UXBX+tqc7F9SQrQv6vmct2R7V11bDaSO7Bh84 WgkFgQvi9S751+CUeseGCiTWiXAnFZFCpicgslPxhUr5oJ4tOC0ehbKGCN/8b6URJUVQ /JQvTP36Sjt0D5hJ5ucVzNRqXZ4gWp8s+QTGg5DdO3sdn86IJj2dSQkkoAGtDSrQQM5O QxaYlsKkliSEOgf2Iyxkl/l0N1zWdsv2aqoOXNBy785KnN6WbuZ0mSd7SmC2j3hR6Icm QbAh+/heupNmS7wBoc6YFzFss7qFqlbXPTfe9iQSZCFgTUZr2gDSkHHr9TuJKO4LO5Mg oPZg== X-Gm-Message-State: AOJu0YwZX9qr8VXikT9VxePNQRdwI01sizsWm/odP03c3b1BXywURhnY pqVzMixBGGFXcQPvZaqF+5tdZO60oPo3ueBbHn8hYpIrcvlaQuPdKBgdzRa3 X-Google-Smtp-Source: AGHT+IFfv4cC6fy0zQyKeZEHPN7jaCHHVpmZhJte39ZAUeDzdFBM0jfIA0TQpLAEpnxYdegq0HCfew== X-Received: by 2002:a5d:428f:0:b0:368:6650:fd16 with SMTP id ffacd0b85a97d-36b5d0aecc8mr7111358f8f.38.1722348558392; Tue, 30 Jul 2024 07:09:18 -0700 (PDT) Received: from localhost.localdomain (232.39-67-87.adsl-dyn.isp.belgacom.be. [87.67.39.232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b36857d66sm14762189f8f.83.2024.07.30.07.09.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 07:09:18 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jul 2024 16:09:15 +0200 Message-Id: <20240730140915.225143-3-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240730140915.225143-1-ramiro.polla@gmail.com> References: <20240730140915.225143-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] compat/w32dlfcn: remove support for pre-KB2533623 Win7 systems 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The KB2533623 security update has been released 13 years ago and Windows 7 has reached end of extended support 4 years ago. --- compat/w32dlfcn.h | 52 ----------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 8ae718f4bd..856ad74cc1 100644 --- a/compat/w32dlfcn.h +++ b/compat/w32dlfcn.h @@ -68,58 +68,6 @@ static inline HMODULE win32_dlopen(const char *name) HMODULE module = NULL; if (utf8towchar(name, &name_w)) name_w = NULL; -#if _WIN32_WINNT < 0x0602 - // On Win7 and earlier we check if KB2533623 is available - if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) { - wchar_t *path = NULL, *new_path; - DWORD pathlen, pathsize, namelen; - if (!name_w) - goto exit; - namelen = wcslen(name_w); - // Try local directory first - 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 = 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, pathsize); - if (!pathlen) - goto exit; - // Buffer is not enough in two cases: - // 1. system directory + \ + module name - // 2. system directory even without the 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 the 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); - } -exit: - av_free(path); - av_free(name_w); - return module; - } -#endif #if HAVE_WINRT if (!name_w) return NULL; -- 2.30.2 _______________________________________________ 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".