From 033f38a28c89945ce4379f5992e8f36943a125ab Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 25 Oct 2022 11:20:31 -0700 Subject: Loc files were still using inner text, stop doing that Fixes 6970 --- src/libs/dutil/WixToolset.DUtil/locutil.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libs/dutil/WixToolset.DUtil/locutil.cpp') diff --git a/src/libs/dutil/WixToolset.DUtil/locutil.cpp b/src/libs/dutil/WixToolset.DUtil/locutil.cpp index c4567c03..318468b4 100644 --- a/src/libs/dutil/WixToolset.DUtil/locutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/locutil.cpp @@ -561,10 +561,10 @@ static HRESULT ParseWxlString( ReleaseNullBSTR(bstrText); // Text - hr = XmlGetText(pixn, &bstrText); - LocExitOnFailure(hr, "Failed to get Xml text in Wxl file."); + hr = XmlGetAttribute(pixn, L"Value", &bstrText); + LocExitOnFailure(hr, "Failed to get Xml attribute Value in Wxl file."); - hr = StrAllocString(&pLocString->wzText, bstrText, 0); + hr = StrAllocString(&pLocString->wzText, bstrText ? bstrText : L"", 0); LocExitOnFailure(hr, "Failed to duplicate Xml text in Wxl file."); LExit: @@ -615,10 +615,10 @@ static HRESULT ParseWxlControl( LocExitOnFailure(hr, "Failed to get control height attribute."); // Text - hr = XmlGetText(pixn, &bstrText); - LocExitOnFailure(hr, "Failed to get control text in Wxl file."); + hr = XmlGetAttribute(pixn, L"Text", &bstrText); + LocExitOnFailure(hr, "Failed to get Xml attribute Text in Wxl file."); - hr = StrAllocString(&pLocControl->wzText, bstrText, 0); + hr = StrAllocString(&pLocControl->wzText, bstrText ? bstrText : L"", 0); LocExitOnFailure(hr, "Failed to duplicate control text in Wxl file."); LExit: -- cgit v1.2.3-55-g6feb