Loc files were still using inner text, stop doing that

Fixes 6970

7 files changed, 183 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(
     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:
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index 210f50f5..ea66ef46 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -55,6 +55,7 @@
     <ClCompile Include="FileUtilTest.cpp" />
     <ClCompile Include="GuidUtilTest.cpp" />
     <ClCompile Include="IniUtilTest.cpp" />
+    <ClCompile Include="LocUtilTests.cpp" />
     <ClCompile Include="MemUtilTest.cpp" />
     <ClCompile Include="MonUtilTest.cpp" />
     <ClCompile Include="PathUtilTest.cpp" />
@@ -82,6 +83,8 @@
 
   <ItemGroup>
     <None Include="TestData\ApupUtilTests\FeedBv2.0.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\LocUtilTests\controls.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\LocUtilTests\strings.wxl" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index f1d9c307..d216f2af 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -75,6 +75,9 @@
     <ClCompile Include="VerUtilTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="LocUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="UnitTest.rc">
@@ -89,4 +92,12 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.testadapter.dll" />
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.reporters.net452.dll" />
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.utility.net452.dll" />
+    <None Include="$(MSBuildThisFileDirectory)xunit.abstractions.dll" />
+    <None Include="TestData\ApupUtilTests\FeedBv2.0.xml" />
+    <None Include="TestData\LocUtilTests\strings.wxl" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libs/dutil/test/DUtilUnitTest/LocUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocUtilTests.cpp
new file mode 100644
index 00000000..c30ae2e1
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/LocUtilTests.cpp
@@ -0,0 +1,151 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+
+namespace DutilTests
+{
+    public ref class LocUtil
+    {
+    public:
+        [Fact]
+        void CanLoadStringsWxl()
+        {
+            HRESULT hr = S_OK;
+            WIX_LOCALIZATION* pLoc = NULL;
+            LOC_STRING* pLocString = NULL;
+            LPWSTR sczValue = NULL;
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                hr = XmlInitialize();
+                NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
+
+                pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "strings.wxl"));
+                hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                NativeAssert::Succeeded(hr, "Failed to parse strings.wxl: {0}", wxlFilePath);
+
+                Assert::Equal(4ul, pLoc->cLocStrings);
+
+                hr = LocGetString(pLoc, L"#(loc.Ex1)", &pLocString);
+                NativeAssert::Succeeded(hr, "Failed to get loc string 'Ex1' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"#(loc.Ex1)", pLocString->wzId);
+                NativeAssert::StringEqual(L"This is example #1", pLocString->wzText);
+                NativeAssert::True(pLocString->bOverridable);
+
+                hr = LocGetString(pLoc, L"#(loc.Ex2)", &pLocString);
+                NativeAssert::Succeeded(hr, "Failed to get loc string 'Ex2' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"#(loc.Ex2)", pLocString->wzId);
+                NativeAssert::StringEqual(L"This is example #2", pLocString->wzText);
+                NativeAssert::False(pLocString->bOverridable);
+
+                hr = LocGetString(pLoc, L"#(loc.Ex3)", &pLocString);
+                NativeAssert::Succeeded(hr, "Failed to get loc string 'Ex3' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"#(loc.Ex3)", pLocString->wzId);
+                NativeAssert::StringEqual(L"This is example #3", pLocString->wzText);
+                NativeAssert::False(pLocString->bOverridable);
+
+                hr = LocGetString(pLoc, L"#(loc.Ex4)", &pLocString);
+                NativeAssert::Succeeded(hr, "Failed to get loc string 'Ex4' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"#(loc.Ex4)", pLocString->wzId);
+                NativeAssert::StringEqual(L"", pLocString->wzText);
+                NativeAssert::False(pLocString->bOverridable);
+
+                hr = StrAllocString(&sczValue, L"Before #(loc.Ex1) After", 0);
+                NativeAssert::Succeeded(hr, "Failed to create localizable Ex1 string");
+
+                hr = LocLocalizeString(pLoc, &sczValue);
+                NativeAssert::Succeeded(hr, "Failed to localize Ex1 string using: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Before This is example #1 After", sczValue);
+
+                hr = StrAllocString(&sczValue, L"Xxx#(loc.Ex3)yyY", 0);
+                NativeAssert::Succeeded(hr, "Failed to create localizable Ex3 string");
+
+                hr = LocLocalizeString(pLoc, &sczValue);
+                NativeAssert::Succeeded(hr, "Failed to localize Ex3 string using: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"XxxThis is example #3yyY", sczValue);
+
+                hr = StrAllocString(&sczValue, L"aaa#(loc.Ex4)bbb", 0);
+                NativeAssert::Succeeded(hr, "Failed to create localizable Ex4 string");
+
+                hr = LocLocalizeString(pLoc, &sczValue);
+                NativeAssert::Succeeded(hr, "Failed to localize Ex4 string using: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"aaabbb", sczValue);
+            }
+            finally
+            {
+                ReleaseStr(sczValue);
+
+                if (pLoc)
+                {
+                    LocFree(pLoc);
+                }
+
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void CanLoadControlsWxl()
+        {
+            HRESULT hr = S_OK;
+            WIX_LOCALIZATION* pLoc = NULL;
+            LOC_CONTROL* pLocControl = NULL;
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                hr = XmlInitialize();
+                NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
+
+                pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "controls.wxl"));
+                hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                NativeAssert::Succeeded(hr, "Failed to parse controls.wxl: {0}", wxlFilePath);
+
+                Assert::Equal(3ul, pLoc->cLocControls);
+
+                hr = LocGetControl(pLoc, L"Control1", &pLocControl);
+                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control1' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Control1", pLocControl->wzControl);
+                NativeAssert::Equal(1, pLocControl->nX);
+                NativeAssert::Equal(2, pLocControl->nY);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nWidth);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nHeight);
+                NativeAssert::StringEqual(L"This is control #1", pLocControl->wzText);
+
+                hr = LocGetControl(pLoc, L"Control2", &pLocControl);
+                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control2' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Control2", pLocControl->wzControl);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nX);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nY);
+                NativeAssert::Equal(50, pLocControl->nWidth);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nHeight);
+                NativeAssert::StringEqual(L"This is control #2", pLocControl->wzText);
+
+                hr = LocGetControl(pLoc, L"Control3", &pLocControl);
+                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control3' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Control3", pLocControl->wzControl);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nX);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nY);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nWidth);
+                NativeAssert::Equal(150, pLocControl->nHeight);
+                NativeAssert::StringEqual(L"", pLocControl->wzText);
+            }
+            finally
+            {
+                if (pLoc)
+                {
+                    LocFree(pLoc);
+                }
+
+                DutilUninitialize();
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/TestData/LocUtilTests/controls.wxl b/src/libs/dutil/test/DUtilUnitTest/TestData/LocUtilTests/controls.wxl
new file mode 100644
index 00000000..938ae0a9
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/TestData/LocUtilTests/controls.wxl
@@ -0,0 +1,5 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+    <UI Control="Control1" X="1" Y="2" Text="This is control #1"></UI>
+    <UI Control="Control2" Width="50" Text="This is control #2" />
+    <UI Control="Control3" Height="150" />
+</WixLocalization>
diff --git a/src/libs/dutil/test/DUtilUnitTest/TestData/LocUtilTests/strings.wxl b/src/libs/dutil/test/DUtilUnitTest/TestData/LocUtilTests/strings.wxl
new file mode 100644
index 00000000..98e58741
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/TestData/LocUtilTests/strings.wxl
@@ -0,0 +1,6 @@
+<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+    <String Id="Ex1" Overridable="yes" Value="This is example #1" />
+    <String Id="Ex2" Overridable="no" Value="This is example #2"></String>
+    <String Id="Ex3" Value="This is example #3"></String>
+    <String Id="Ex4" />
+</WixLocalization>
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
index a5542774..92310b41 100644
--- a/src/libs/dutil/test/DUtilUnitTest/precomp.h
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
@@ -21,6 +21,7 @@
 #include <fileutil.h>
 #include <guidutil.h>
 #include <iniutil.h>
+#include <locutil.h>
 #include <memutil.h>
 #include <pathutil.h>
 #include <procutil.h>