From patchwork Wed Dec 19 09:26:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 646 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id SKHMML2pGlyCWQAAIUCqbw for ; Wed, 19 Dec 2018 15:27:41 -0500 Received: from proxy13.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id iC24Lb2pGlzZewAAalYnBA ; Wed, 19 Dec 2018 15:27:41 -0500 Received: from smtp20.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy13.mail.iad3b.rsapps.net with LMTP id CCXZJr2pGlwbbAAAvUvv+w ; Wed, 19 Dec 2018 15:27:41 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp20.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Suspicious-Flag: YES X-Classification-ID: 881749c0-03cc-11e9-b905-525400497f28-1-1 Received: from [216.105.38.7] ([216.105.38.7:12121] helo=lists.sourceforge.net) by smtp20.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 07/E2-31921-CB9AA1C5; Wed, 19 Dec 2018 15:27:41 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1gZiQO-0002c4-1h; Wed, 19 Dec 2018 20:26:36 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1gZiQM-0002bv-Ke for openvpn-devel@lists.sourceforge.net; Wed, 19 Dec 2018 20:26:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=FMyBM/4JlASiF8SoxNMSJjd/IlppoH99Id9ZYIF2Ql8=; b=Nyb8owBQ1ZI8KJLn+EALmRghk9 6bJdgSQSxJQG8Jw6cHgJkbcyn+a2y+Pi3tcUxTi83lHoTSRiyxBDpwjCQVQfQqhvxcTHMTdRXgq6Y B5uYUI8Ci8Tgi2VhwBqyCNS6GjB8eI+0C1LM+gW2rRhTeyyswf45ielABJs+22+LmIug=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=FMyBM/4JlASiF8SoxNMSJjd/IlppoH99Id9ZYIF2Ql8=; b=S IdjCwdtPN6J5eHColUrfcStmq69iNF3kFcryWDsE0Z959twFfF3hAhKISQbufXloqGcTzLsiWcrar aJ1Y3xEX2wz9Wzh4QkmBBqKrMe76kG+m/yY7wOL7Dv+gtCbr/TVflHq/52D+tE0kc3zEZIQCgzGoG 7hgkeJuOxKL6HE7g=; Received: from pub5.amebis.si ([213.250.55.21]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1gZiQG-008YMm-7T for openvpn-devel@lists.sourceforge.net; Wed, 19 Dec 2018 20:26:34 +0000 Received: by pub5.amebis.si (Postfix, from userid 115) id F3575205F7; Wed, 19 Dec 2018 21:26:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1545251180; bh=AO1Z6YQbLmyNKqsQZlHc8IpTko0K2L9EnEU+JIZEoP0=; h=From:To:Cc:Subject:Date:From; b=Pfto54sv3N5zY1lV6ucAjpK1yxYQpczmgPwahyM/j9k4BOuWrqRvkniK8m1p6L+b4 Gh3hMexW+YGQ85+18TypOi8P8RnZPTM2eFQxtliRRNrYhmy9kvOrNlrHl05nwWCXlU 1ke2KMDysVm7WcAzluPT4DbBEjwrAPnp/sOxh6Vs= X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on brana.amebis.doma X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=RDNS_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from gw0.selo.doma (unknown [IPv6:2a00:ee2:1206:8101::1]) by pub5.amebis.si (Postfix) with ESMTP id 74B5A200FE; Wed, 19 Dec 2018 21:26:19 +0100 (CET) Received: from s0.selo.doma (s0.selo.doma [IPv6:2a00:ee2:1206:8101::d]) by gw0.selo.doma (Postfix) with ESMTP id 3745921B9829; Wed, 19 Dec 2018 21:26:19 +0100 (CET) From: Simon Rozman To: openvpn-devel@lists.sourceforge.net Date: Wed, 19 Dec 2018 21:26:08 +0100 Message-Id: <20181219202611.2144-1-simon@rozman.si> X-Mailer: git-send-email 2.19.0.windows.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1gZiQG-008YMm-7T Subject: [Openvpn-devel] [PATCH 1/4] Make DriverCertification MSI property public X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Making DriverCertification public (containing only upper-case letters) allows the property set by FindSystemInfo custom action to be passed from InstallUISequence sequence to InstallExecuteSequence. This eliminates the need to execute FindSystemInfo in both sequences. Acked-by: Gert Doering --- src/openvpnmsica/openvpnmsica.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index 86434801..721bd4f8 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -289,11 +289,11 @@ FindSystemInfo(_In_ MSIHANDLE hInstall) } } - uiResult = MsiSetProperty(hInstall, TEXT("DriverCertification"), ver_info.dwMajorVersion >= 10 ? ver_info.wProductType > VER_NT_WORKSTATION ? TEXT("whql") : TEXT("attsgn") : TEXT("")); + uiResult = MsiSetProperty(hInstall, TEXT("DRIVERCERTIFICATION"), ver_info.dwMajorVersion >= 10 ? ver_info.wProductType > VER_NT_WORKSTATION ? TEXT("whql") : TEXT("attsgn") : TEXT("")); if (uiResult != ERROR_SUCCESS) { SetLastError(uiResult); /* MSDN does not mention MsiSetProperty() to set GetLastError(). But we do have an error code. Set last error manually. */ - msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"TAPINTERFACES\") failed", __FUNCTION__); + msg(M_NONFATAL | M_ERRNO, "%s: MsiSetProperty(\"DRIVERCERTIFICATION\") failed", __FUNCTION__); goto cleanup_CoInitialize; }