diff options
author | Bob Arnson <bob@firegiant.com> | 2024-11-10 14:11:16 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2024-11-10 20:14:39 -0500 |
commit | f440fb317c630e7bc6d4ee4d657a200654e2f876 (patch) | |
tree | 9f10c6398c1f09bbdd1007ff7ca9d048c910dfc4 | |
parent | cc9463ee3cb08847c0dc66dc08529e8b5f696bf4 (diff) | |
download | wix-f440fb317c630e7bc6d4ee4d657a200654e2f876.tar.gz wix-f440fb317c630e7bc6d4ee4d657a200654e2f876.tar.bz2 wix-f440fb317c630e7bc6d4ee4d657a200654e2f876.zip |
Typos are bad; visible typos are an abomination.
At least one person makes the same typo almost-but-not-quite everywhere.
11 files changed, 12 insertions, 12 deletions
diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp index 5d8bfa9c..716f82d3 100644 --- a/src/api/burn/balutil/balutil.cpp +++ b/src/api/burn/balutil/balutil.cpp | |||
@@ -162,7 +162,7 @@ DAPI_(VOID) BalDebuggerCheck() | |||
162 | 162 | ||
163 | if (fDebug) | 163 | if (fDebug) |
164 | { | 164 | { |
165 | hr = ::StringCchPrintfW(wzMessage, countof(wzMessage), L"To debug the boostrapper application process %ls\n\nSet breakpoints and attach a debugger to process id: %d (0x%x)", wzModuleFilename, ::GetCurrentProcessId(), ::GetCurrentProcessId()); | 165 | hr = ::StringCchPrintfW(wzMessage, countof(wzMessage), L"To debug the bootstrapper application process %ls\n\nSet breakpoints and attach a debugger to process id: %d (0x%x)", wzModuleFilename, ::GetCurrentProcessId(), ::GetCurrentProcessId()); |
166 | 166 | ||
167 | if (SUCCEEDED(hr)) | 167 | if (SUCCEEDED(hr)) |
168 | { | 168 | { |
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h index 32190b56..03575883 100644 --- a/src/api/burn/balutil/inc/balutil.h +++ b/src/api/burn/balutil/inc/balutil.h | |||
@@ -44,7 +44,7 @@ static const HRESULT E_PREREQBA_INFINITE_LOOP = MAKE_HRESULT(SEVERITY_ERROR, FAC | |||
44 | 44 | ||
45 | /******************************************************************* | 45 | /******************************************************************* |
46 | BalDebuggerCheck - allows bootstrapper application to explicitly check | 46 | BalDebuggerCheck - allows bootstrapper application to explicitly check |
47 | whether a debugger should be attached to the boostrapper application. | 47 | whether a debugger should be attached to the bootstrapper application. |
48 | 48 | ||
49 | Note: Automatically called in BootstrapperApplicationRun(). | 49 | Note: Automatically called in BootstrapperApplicationRun(). |
50 | ********************************************************************/ | 50 | ********************************************************************/ |
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index 619ff0d1..d7ef40d7 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp | |||
@@ -782,7 +782,7 @@ LExit: | |||
782 | { | 782 | { |
783 | // If the BA requested a reload but we do not have a secondary EXE, | 783 | // If the BA requested a reload but we do not have a secondary EXE, |
784 | // then log a message and do not reload. | 784 | // then log a message and do not reload. |
785 | LogId(REPORT_STANDARD, MSG_BA_NO_SECONDARY_BOOSTRAPPER_SO_RELOAD_NOT_SUPPORTED); | 785 | LogId(REPORT_STANDARD, MSG_BA_NO_SECONDARY_BOOTSTRAPPER_SO_RELOAD_NOT_SUPPORTED); |
786 | *pfReloadApp = FALSE; | 786 | *pfReloadApp = FALSE; |
787 | } | 787 | } |
788 | 788 | ||
diff --git a/src/burn/engine/engine.mc b/src/burn/engine/engine.mc index 916b6d8b..c7a07385 100644 --- a/src/burn/engine/engine.mc +++ b/src/burn/engine/engine.mc | |||
@@ -255,7 +255,7 @@ Bootstrapper application already requested to quit, ignoring request: '%1!hs!'. | |||
255 | 255 | ||
256 | MessageId=59 | 256 | MessageId=59 |
257 | Severity=Warning | 257 | Severity=Warning |
258 | SymbolicName=MSG_BA_NO_SECONDARY_BOOSTRAPPER_SO_RELOAD_NOT_SUPPORTED | 258 | SymbolicName=MSG_BA_NO_SECONDARY_BOOTSTRAPPER_SO_RELOAD_NOT_SUPPORTED |
259 | Language=English | 259 | Language=English |
260 | Bootstrapper application requested reload but there is no secondary bootstrapper application, ignoring the request to reload. | 260 | Bootstrapper application requested reload but there is no secondary bootstrapper application, ignoring the request to reload. |
261 | . | 261 | . |
diff --git a/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj index d2688a00..2d241963 100644 --- a/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> | 5 | <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> |
6 | </ItemGroup> | 6 | </ItemGroup> |
7 | <ItemGroup> | 7 | <ItemGroup> |
8 | <!-- For testing purposes: Use old Bal WiX extension instead of new BoostrapperApplications.wixext --> | 8 | <!-- For testing purposes: Use old Bal WiX extension instead of new BootstrapperApplications.wixext --> |
9 | <PackageReference Include="WixToolset.Bal.wixext" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" /> |
10 | </ItemGroup> | 10 | </ItemGroup> |
11 | </Project> | 11 | </Project> |
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj index 06b07dcb..1a802656 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj | |||
@@ -13,7 +13,7 @@ | |||
13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
14 | </ItemGroup> | 14 | </ItemGroup> |
15 | <ItemGroup> | 15 | <ItemGroup> |
16 | <!-- For testing purposes: Use old Bal WiX extension instead of new BoostrapperApplications.wixext --> | 16 | <!-- For testing purposes: Use old Bal WiX extension instead of new BootstrapperApplications.wixext --> |
17 | <PackageReference Include="WixToolset.Bal.wixext" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
18 | <PackageReference Include="WixToolset.NetFx.wixext" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
19 | </ItemGroup> | 19 | </ItemGroup> |
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index 3dbbffa7..91146a0f 100644 --- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | |||
@@ -108,7 +108,7 @@ namespace WixToolset.Core.Burn | |||
108 | command.Execute(); | 108 | command.Execute(); |
109 | } | 109 | } |
110 | 110 | ||
111 | // Find the primary boostrapper application and optional secondary. | 111 | // Find the primary bootstrapper application and optional secondary. |
112 | WixBootstrapperApplicationSymbol primaryBootstrapperApplicationSymbol = null; | 112 | WixBootstrapperApplicationSymbol primaryBootstrapperApplicationSymbol = null; |
113 | WixBootstrapperApplicationSymbol secondaryBootstrapperApplicationSymbol = null; | 113 | WixBootstrapperApplicationSymbol secondaryBootstrapperApplicationSymbol = null; |
114 | { | 114 | { |
diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs index c7003a2a..2daf376f 100644 --- a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs +++ b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs | |||
@@ -115,7 +115,7 @@ namespace WixToolset.Core.Burn | |||
115 | 115 | ||
116 | public static Message BundleMissingBootstrapperApplicationContainer(SourceLineNumber sourceLineNumbers, string path) | 116 | public static Message BundleMissingBootstrapperApplicationContainer(SourceLineNumber sourceLineNumbers, string path) |
117 | { | 117 | { |
118 | return Message(sourceLineNumbers, Ids.BundleMissingBootstrapperApplicationContainer, "Bundle is invalid. The BoostrapperApplication attached container is missing from the file: {0}", path); | 118 | return Message(sourceLineNumbers, Ids.BundleMissingBootstrapperApplicationContainer, "Bundle is invalid. The BootstrapperApplication attached container is missing from the file: {0}", path); |
119 | } | 119 | } |
120 | 120 | ||
121 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) | 121 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs index eead3c36..e713581a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs | |||
@@ -2,7 +2,7 @@ | |||
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
3 | 3 | ||
4 | <Fragment> | 4 | <Fragment> |
5 | <PayloadGroup Id="override ExtraBoostrapperApplicationPayloads"> | 5 | <PayloadGroup Id="override ExtraBootstrapperApplicationPayloads"> |
6 | <Payload Id="DuplicatePayloadNames.wxs" SourceFile="$(sys.SOURCEFILEPATH)" Name="fakeba.dll" /> | 6 | <Payload Id="DuplicatePayloadNames.wxs" SourceFile="$(sys.SOURCEFILEPATH)" Name="fakeba.dll" /> |
7 | <Payload Id="UnscheduledPackage.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledPackage.wxs" Name="BootstrapperApplicationData.xml" /> | 7 | <Payload Id="UnscheduledPackage.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledPackage.wxs" Name="BootstrapperApplicationData.xml" /> |
8 | <Payload Id="UnscheduledRollbackBoundary.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledRollbackBoundary.wxs" Name="BootstrapperExtensionData.xml" /> | 8 | <Payload Id="UnscheduledRollbackBoundary.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledRollbackBoundary.wxs" Name="BootstrapperExtensionData.xml" /> |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs index 7d406990..8ea74fe4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs | |||
@@ -1,7 +1,7 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC"> | 2 | <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC"> |
3 | <BootstrapperApplication SourceFile="fakeba.dll"> | 3 | <BootstrapperApplication SourceFile="fakeba.dll"> |
4 | <PayloadGroupRef Id="ExtraBoostrapperApplicationPayloads" /> | 4 | <PayloadGroupRef Id="ExtraBootstrapperApplicationPayloads" /> |
5 | </BootstrapperApplication> | 5 | </BootstrapperApplication> |
6 | 6 | ||
7 | <Chain> | 7 | <Chain> |
@@ -10,6 +10,6 @@ | |||
10 | </Bundle> | 10 | </Bundle> |
11 | 11 | ||
12 | <Fragment> | 12 | <Fragment> |
13 | <PayloadGroup Id="virtual ExtraBoostrapperApplicationPayloads" /> | 13 | <PayloadGroup Id="virtual ExtraBootstrapperApplicationPayloads" /> |
14 | </Fragment> | 14 | </Fragment> |
15 | </Wix> | 15 | </Wix> |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs index d7425318..57e0030c 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs | |||
@@ -7,7 +7,7 @@ | |||
7 | </ExePackage> | 7 | </ExePackage> |
8 | </PackageGroup> | 8 | </PackageGroup> |
9 | 9 | ||
10 | <PayloadGroup Id="override ExtraBoostrapperApplicationPayloads"> | 10 | <PayloadGroup Id="override ExtraBootstrapperApplicationPayloads"> |
11 | <PayloadGroupRef Id="Shared" /> | 11 | <PayloadGroupRef Id="Shared" /> |
12 | </PayloadGroup> | 12 | </PayloadGroup> |
13 | 13 | ||