diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-15 18:17:38 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-15 18:17:38 -0500 |
| commit | 559dbc8dc9c1e3bfe03c0257c6e396cec87a9b6a (patch) | |
| tree | 8789fb0bac56d069c412aec20b8627daa73a6dc6 /src/wixstdba/WixStandardBootstrapperApplication.cpp | |
| parent | dd04895571894674e356cce1cab259758e9a87f2 (diff) | |
| download | wix-559dbc8dc9c1e3bfe03c0257c6e396cec87a9b6a.tar.gz wix-559dbc8dc9c1e3bfe03c0257c6e396cec87a9b6a.tar.bz2 wix-559dbc8dc9c1e3bfe03c0257c6e396cec87a9b6a.zip | |
Update dependencies.
Diffstat (limited to 'src/wixstdba/WixStandardBootstrapperApplication.cpp')
| -rw-r--r-- | src/wixstdba/WixStandardBootstrapperApplication.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index f690c1a6..8b4b89a1 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp | |||
| @@ -2095,7 +2095,7 @@ private: // privates | |||
| 2095 | LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; | 2095 | LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; |
| 2096 | 2096 | ||
| 2097 | // Find and load .wxl file. | 2097 | // Find and load .wxl file. |
| 2098 | hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath); | 2098 | hr = LocProbeForFileEx(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath, TRUE); |
| 2099 | BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); | 2099 | BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); |
| 2100 | 2100 | ||
| 2101 | hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); | 2101 | hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); |
| @@ -2142,7 +2142,7 @@ private: // privates | |||
| 2142 | LPWSTR sczThemePath = NULL; | 2142 | LPWSTR sczThemePath = NULL; |
| 2143 | LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; | 2143 | LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; |
| 2144 | 2144 | ||
| 2145 | hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath); | 2145 | hr = LocProbeForFileEx(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath, TRUE); |
| 2146 | BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); | 2146 | BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); |
| 2147 | 2147 | ||
| 2148 | hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); | 2148 | hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); |
| @@ -2808,7 +2808,7 @@ private: // privates | |||
| 2808 | hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); | 2808 | hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); |
| 2809 | if (SUCCEEDED(hr)) | 2809 | if (SUCCEEDED(hr)) |
| 2810 | { | 2810 | { |
| 2811 | hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath); | 2811 | hr = LocProbeForFileEx(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath, TRUE); |
| 2812 | if (SUCCEEDED(hr)) | 2812 | if (SUCCEEDED(hr)) |
| 2813 | { | 2813 | { |
| 2814 | hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); | 2814 | hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); |
| @@ -3325,7 +3325,7 @@ private: // privates | |||
| 3325 | hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); | 3325 | hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); |
| 3326 | if (SUCCEEDED(hr)) | 3326 | if (SUCCEEDED(hr)) |
| 3327 | { | 3327 | { |
| 3328 | hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath); | 3328 | hr = LocProbeForFileEx(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath, TRUE); |
| 3329 | } | 3329 | } |
| 3330 | } | 3330 | } |
| 3331 | } | 3331 | } |
