Skip to content

Commit 1935bd1

Browse files
committed
Merge branch 'main' of github.com:microsoft/WindowsAppSDK into user/DinahK-2SO/StoragePickers_errorHandling
2 parents 687f58c + 8635d0b commit 1935bd1

File tree

18 files changed

+65
-8
lines changed

18 files changed

+65
-8
lines changed

build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ steps:
8484
msBuildCommandline: 'msbuild.exe /restore /nologo /nr:false /p:configuration=Release /p:platform=x64 $(Build.SourcesDirectory)\WindowsAppRuntime.sln'
8585
# Generally speaking, we leave it to the external repos to scan the bits in their packages.
8686
excludedPaths: |
87-
$(Build.SourcesDirectory)\packages
87+
$(Agent.ToolsDirectory)\uCRT\#$(Build.SourcesDirectory)\obj\$(buildConfiguration)\$(buildPlatform)#$(Build.SourcesDirectory)\packages
8888
env:
8989
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9090
continueOnError: true

build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ jobs:
5757
testPayloadArtifactDir: $(Build.SourcesDirectory)\BuildOutput\$(buildConfiguration)\$(buildPlatform)
5858
AZURE_PIPELINES_DEDUP_PARALLELISM: 16
5959
artifactAttempt: ''
60+
ob_artifactSuffix: '_$(buildConfiguration)$(buildPlatform)_$(Agent.JobStatus)$(artifactAttempt)'
61+
ob_artifactBaseName: '$(System.StageName)_$(imageName)'
6062
steps:
6163
- template: WindowsAppSDK-RunTests-Steps.yml
6264
parameters:

build/ProjectReunion-CI.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,13 @@ jobs:
182182
- BuildMRT
183183
variables:
184184
testPayloadArtifactDir: $(Build.SourcesDirectory)\BuildOutput\$(buildConfiguration)\$(buildPlatform)
185+
artifactAttempt: ''
186+
ob_artifactSuffix: '_$(buildConfiguration)$(buildPlatform)_$(Agent.JobStatus)$(artifactAttempt)'
187+
ob_artifactBaseName: '$(System.StageName)_$(imageName)'
185188
steps:
186189
- template: AzurePipelinesTemplates\WindowsAppSDK-RunTests-Steps.yml
187190
parameters:
188191
buildPlatform: $(buildPlatform)
189192
buildConfiguration: $(buildConfiguration)
190193
testLocale: $(testLocale)
194+
ImageName: $(imageName)

dev/BackgroundTask/BackgroundTaskBuilder/BackgroundTaskBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::Background::implementatio
1010
{
1111
struct BackgroundTaskBuilder : BackgroundTaskBuilderT<BackgroundTaskBuilder>
1212
{
13-
BackgroundTaskBuilder()
13+
BackgroundTaskBuilder(): m_taskEntryPointClsid{}
1414
{
1515
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::ApplicationModel::Background::Feature_BackgroundTask::IsEnabled());
1616
}

dev/Detours/disasm.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,10 @@ CDetourDis::CDetourDis(_Out_opt_ PBYTE *ppbTarget, _Out_opt_ LONG *plExtra)
334334
m_bF3 = FALSE;
335335
m_bVex = FALSE;
336336
m_bEvex = FALSE;
337+
m_nSegmentOverride = 0;
338+
m_lScratchExtra = 0;
339+
m_pbScratchTarget = nullptr;
340+
ZeroMemory(m_rbScratchDst, sizeof(m_rbScratchDst));
337341

338342
m_ppbTarget = ppbTarget ? ppbTarget : &m_pbScratchTarget;
339343
m_plExtra = plExtra ? plExtra : &m_lScratchExtra;
@@ -3562,6 +3566,7 @@ CDetourDis::CDetourDis()
35623566
m_pbTarget = (PBYTE)DETOUR_INSTRUCTION_TARGET_NONE;
35633567
m_pbPool = NULL;
35643568
m_lExtra = 0;
3569+
ZeroMemory(m_rbScratchDst, sizeof(m_rbScratchDst));
35653570
}
35663571

35673572
PBYTE CDetourDis::CopyInstruction(PBYTE pDst,
@@ -3965,6 +3970,7 @@ BYTE CDetourDis::PureCopy32(BYTE* pSource, BYTE* pDest)
39653970
CDetourDis::CDetourDis()
39663971
{
39673972
m_pbTarget = (PBYTE)DETOUR_INSTRUCTION_TARGET_NONE;
3973+
ZeroMemory(m_rbScratchDst, sizeof(m_rbScratchDst));
39683974
}
39693975

39703976
PBYTE CDetourDis::CopyInstruction(PBYTE pDst,

dev/Detours/image.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,25 @@ CImage::CImage()
775775
m_hMap = NULL;
776776
m_pMap = NULL;
777777

778+
m_nNextFileAddr = 0;
779+
m_nNextVirtAddr = 0;
780+
781+
ZeroMemory(&m_DosHeader, sizeof(m_DosHeader));
782+
ZeroMemory(&m_NtHeader, sizeof(m_NtHeader));
783+
ZeroMemory(&m_SectionHeaders, sizeof(m_SectionHeaders));
784+
785+
m_nPrePE = 0;
786+
m_cbPrePE = 0;
787+
m_cbPostPE = 0;
788+
778789
m_nPeOffset = 0;
779790
m_nSectionsOffset = 0;
791+
m_nExtraOffset = 0;
792+
m_nFileSize = 0;
793+
794+
m_nOutputVirtAddr = 0;
795+
m_nOutputVirtSize = 0;
796+
m_nOutputFileAddr = 0;
780797

781798
m_pbOutputBuffer = NULL;
782799
m_cbOutputBuffer = 0;

dev/Interop/StoragePickers/Strings/StoragePickers.resw

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,19 @@
120120
<data name="All Files" xml:space="preserve">
121121
<value>All Files</value>
122122
</data>
123-
</root>
123+
<data name="IDS_APIERROR_INVALIDVIEWMODEVALUE" xml:space="preserve">
124+
<value>The specified 'ViewMode' is invalid.</value>
125+
</data>
126+
<data name="IDS_APIERROR_INVALIDSUGGESTEDSTARTLOCATIONVALUE" xml:space="preserve">
127+
<value>The specified 'SuggestedStartLocation' is invalid.</value>
128+
</data>
129+
<data name="IDS_APIERROR_IMPROPERFILEEXTENSION" xml:space="preserve">
130+
<value>File extensions must begin with '.' and contain no wildcards.</value>
131+
</data>
132+
<data name="IDS_APIERROR_STRINGSNOEMBEDDEDNULLS" xml:space="preserve">
133+
<value>Strings cannot have embedded nulls.</value>
134+
</data>
135+
<data name="IDS_APIERROR_MAXSAVEFILELENGTHEXCEEDED" xml:space="preserve">
136+
<value>The suggested file name exceeds the maximum number of characters allowed.</value>
137+
</data>
138+
</root>

dev/MRTCore/mrt/mrm/UnitTests/StringResult.UnitTests.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ struct StringResult_Struct
4242

4343
StringResult_Struct()
4444
{
45+
origRef = nullptr;
4546
shortStr = L"Bye!";
4647
medStr = L"Hello!";
4748
concatStr = L" What's Up?";

dev/MRTCore/mrt/mrm/UnitTests/TestFileUtils.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ namespace UnitTests
1515
{
1616

1717
FileBasedTest::FileBasedTest() : m_runFrom(Current), m_pTestClassName(nullptr), m_pTestMethodName(nullptr), m_pClassDataSubfolder(nullptr)
18-
{}
18+
{
19+
m_originalDir[0] = L'\0';
20+
}
1921

2022
DWORD
2123
FileBasedTest::CreateDirectoryHierarchy(_In_ const WEX::Common::String& path)

dev/MRTCore/mrt/mrm/UnitTests/TestReverseMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ using namespace WEX::Logging;
1515
namespace UnitTests
1616
{
1717

18-
TestReverseFileMap::TestReverseFileMap() : m_build(), m_pPriBuilder(NULL), m_pReverseFileMapBuilder(NULL), m_pReverseFileMap(NULL) {}
18+
TestReverseFileMap::TestReverseFileMap() : m_build(), m_pPriBuilder(NULL), m_pReverseFileMapBuilder(NULL), m_pReverseFileMap(NULL), m_pTestDI(nullptr), m_testDI(), m_pDecisionInfo(nullptr) {}
1919

2020
HRESULT
2121
TestReverseFileMap::InitFromTestVars(__in PriSectionBuilder* pPriBuilder, __in UnifiedEnvironment* pEnvironment, __in PCWSTR pVarPrefix)

0 commit comments

Comments
 (0)