From 58d993cb1c1db4adaa204c0c0145fe3e4d7c48cd Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Mon, 21 Sep 2020 12:47:01 -0400 Subject: [PATCH] Fix name of the registry parameter for MAC address - Replace registry entry MAC by NetworkAddress. - Add a directive to remove any old entry named MAC to support upgrade. No validation of input is done. Windows accepts MAC as 12 hex characters with an optional hyphen between bytes but not colons. Also the MAC should be a valid "locally administered address". Signed-off-by: Selva Nair --- src/OemVista.inf.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/OemVista.inf.in b/src/OemVista.inf.in index c7fd653..92cd39e 100644 --- a/src/OemVista.inf.in +++ b/src/OemVista.inf.in @@ -88,6 +88,7 @@ CopyFiles = @PRODUCT_TAP_WIN_COMPONENT_ID@.driver, @PRODUCT_TAP_WIN_COMPONENT_ID@.files AddReg = @PRODUCT_TAP_WIN_COMPONENT_ID@.reg AddReg = @PRODUCT_TAP_WIN_COMPONENT_ID@.params.reg + DelReg = @PRODUCT_TAP_WIN_COMPONENT_ID@.params.delreg Characteristics = @PRODUCT_TAP_WIN_CHARACTERISTICS@ *IfType = 53 ; IF_TYPE_PROP_VIRTUAL *MediaType = 0x0 ; NdisMedium802_3 @@ -117,9 +118,9 @@ HKR, Ndi\params\MediaStatus, Optional, 0, "0" HKR, Ndi\params\MediaStatus\enum, "0", 0, "Application Controlled" HKR, Ndi\params\MediaStatus\enum, "1", 0, "Always Connected" - HKR, Ndi\params\MAC, ParamDesc, 0, "MAC Address" - HKR, Ndi\params\MAC, Type, 0, "edit" - HKR, Ndi\params\MAC, Optional, 0, "1" + HKR, Ndi\params\NetworkAddress, ParamDesc, 0, "MAC Address" + HKR, Ndi\params\NetworkAddress, Type, 0, "edit" + HKR, Ndi\params\NetworkAddress, Optional, 0, "1" HKR, Ndi\params\AllowNonAdmin, ParamDesc, 0, "Non-Admin Access" HKR, Ndi\params\AllowNonAdmin, Type, 0, "enum" HKR, Ndi\params\AllowNonAdmin, Default, 0, "1" @@ -127,6 +128,9 @@ HKR, Ndi\params\AllowNonAdmin\enum, "0", 0, "Not Allowed" HKR, Ndi\params\AllowNonAdmin\enum, "1", 0, "Allowed" +[@PRODUCT_TAP_WIN_COMPONENT_ID@.params.delreg] + HKR, Ndi\params\MAC + ;---------------------------------------------------------------- ; Service Section ;----------------------------------------------------------------