diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-03 17:49:33 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-07 19:44:36 -0500 |
| commit | 266b097c0b0a13dd4934f55f61cad62ffcbb953d (patch) | |
| tree | 21400e8e1f7a6a5ebbc1abaacb40c472fc0b9fbc /src/libs/dutil/WixToolset.DUtil/regutil.cpp | |
| parent | 584213c5ffeca09b3fe24bd5e92f73fd057ac642 (diff) | |
| download | wix-266b097c0b0a13dd4934f55f61cad62ffcbb953d.tar.gz wix-266b097c0b0a13dd4934f55f61cad62ffcbb953d.tar.bz2 wix-266b097c0b0a13dd4934f55f61cad62ffcbb953d.zip | |
REG_EXPAND_SZ values are not necessarily a path.
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/regutil.cpp')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/regutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/regutil.cpp b/src/libs/dutil/WixToolset.DUtil/regutil.cpp index 584966ed..9a1b9ced 100644 --- a/src/libs/dutil/WixToolset.DUtil/regutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/regutil.cpp | |||
| @@ -444,7 +444,7 @@ DAPI_(HRESULT) RegReadValue( | |||
| 444 | if (fExpand && SUCCEEDED(hr) && REG_EXPAND_SZ == *pdwType) | 444 | if (fExpand && SUCCEEDED(hr) && REG_EXPAND_SZ == *pdwType) |
| 445 | { | 445 | { |
| 446 | LPWSTR sczValue = reinterpret_cast<LPWSTR>(*ppbBuffer); | 446 | LPWSTR sczValue = reinterpret_cast<LPWSTR>(*ppbBuffer); |
| 447 | hr = PathExpand(&sczExpand, sczValue, PATH_EXPAND_ENVIRONMENT); | 447 | hr = EnvExpandEnvironmentStrings(sczValue, &sczExpand, NULL); |
| 448 | RegExitOnFailure(hr, "Failed to expand registry value: %ls", sczValue); | 448 | RegExitOnFailure(hr, "Failed to expand registry value: %ls", sczValue); |
| 449 | 449 | ||
| 450 | *ppbBuffer = reinterpret_cast<LPBYTE>(sczExpand); | 450 | *ppbBuffer = reinterpret_cast<LPBYTE>(sczExpand); |