summaryrefslogtreecommitdiff
path: root/src/libs/dutil/WixToolset.DUtil/locutil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/locutil.cpp')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/locutil.cpp12
1 files changed, 6 insertions, 6 deletions
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(
561 ReleaseNullBSTR(bstrText); 561 ReleaseNullBSTR(bstrText);
562 562
563 // Text 563 // Text
564 hr = XmlGetText(pixn, &bstrText); 564 hr = XmlGetAttribute(pixn, L"Value", &bstrText);
565 LocExitOnFailure(hr, "Failed to get Xml text in Wxl file."); 565 LocExitOnFailure(hr, "Failed to get Xml attribute Value in Wxl file.");
566 566
567 hr = StrAllocString(&pLocString->wzText, bstrText, 0); 567 hr = StrAllocString(&pLocString->wzText, bstrText ? bstrText : L"", 0);
568 LocExitOnFailure(hr, "Failed to duplicate Xml text in Wxl file."); 568 LocExitOnFailure(hr, "Failed to duplicate Xml text in Wxl file.");
569 569
570LExit: 570LExit:
@@ -615,10 +615,10 @@ static HRESULT ParseWxlControl(
615 LocExitOnFailure(hr, "Failed to get control height attribute."); 615 LocExitOnFailure(hr, "Failed to get control height attribute.");
616 616
617 // Text 617 // Text
618 hr = XmlGetText(pixn, &bstrText); 618 hr = XmlGetAttribute(pixn, L"Text", &bstrText);
619 LocExitOnFailure(hr, "Failed to get control text in Wxl file."); 619 LocExitOnFailure(hr, "Failed to get Xml attribute Text in Wxl file.");
620 620
621 hr = StrAllocString(&pLocControl->wzText, bstrText, 0); 621 hr = StrAllocString(&pLocControl->wzText, bstrText ? bstrText : L"", 0);
622 LocExitOnFailure(hr, "Failed to duplicate control text in Wxl file."); 622 LocExitOnFailure(hr, "Failed to duplicate control text in Wxl file.");
623 623
624LExit: 624LExit: