Adapt to RegGetValue brokenness in Windows 7
PATCH 1/1 Adapt to RegGetValue brokenness in Windows 7
From: Selva Nair <[email protected]...>
- RegGetValue with flags = RRF_RT_REG_SZ|RRF_RT_REG_EXPAND_SZ fails in Windows 7 with an "invalid parameter" error. Fix by using RRF_RT_REG_SZ alone.
Note: This is not a regression as in no released version did the service support expandable strings (ones with embedded %FOO%) in the registry. However, the GUI does expand such strings. The two can be made consistent by explicitly expanding the strings -- that is left for a future patch.
--- src/openvpnserv/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpnserv/common.c +1 -1
@@ -59,7 +59,7 @@ openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...)static DWORD GetRegString (HKEY key,LPCTSTR value,LPTSTR data,DWORD size,LPCTSTR default_value) { -LONG status =RegGetValue (key,NULL , value,RRF_RT_REG_SZ |RRF_RT_REG_EXPAND_SZ , +LONG status =RegGetValue (key,NULL , value,RRF_RT_REG_SZ ,NULL , (LPBYTE ) data, &size);if (status ==ERROR_FILE_NOT_FOUND && default_value)
Signature · 1 line
2.1.4
Patch matches the problem discussed in the mail thread here and on stackoverflow (RRF_RT_REG_SZ|RRF_RT_REG_EXPAND_SZ broken on Win7), cross compiled on ubuntu 16.04, installed & tested on Win7/64, and works again :-)
Thanks.
Your patch has been applied to the master and release/2.4 branch.
commit 7de0ee4f6f6f44fab48717e4cc2073ff4e8580f6 (master) commit e9b85ebd2895fda85daeb15a9794d5a2e3a79fab (release/2.4)
Author: Selva Nair Date: Wed Feb 21 00:38:30 2018 -0500
Adapt to RegGetValue brokenness in Windows 7
Signed-off-by: Selva Nair <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg16513.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering