From: Selva Nair Date: Wed, 21 Feb 2018 05:38:30 +0000 (-0500) Subject: Adapt to RegGetValue brokenness in Windows 7 X-Git-Tag: v2.4.5~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b85ebd2895fda85daeb15a9794d5a2e3a79fab;p=thirdparty%2Fopenvpn.git Adapt to RegGetValue brokenness in Windows 7 - 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. Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <1519191510-3826-1-git-send-email-selva.nair@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16513.html Signed-off-by: Gert Doering (cherry picked from commit 7de0ee4f6f6f44fab48717e4cc2073ff4e8580f6) --- diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index 6c29f5799..dc47666d3 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -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)