Skip to content

Commit f6e38d6

Browse files
ThomasGoulet73ThomasGoulet73
authored
Run MilCodeGen for WpfGfx (#10431)
Contributes to #10429
1 parent d1d9fe4 commit f6e38d6

20 files changed

+332
-394
lines changed

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/codegen/mcg/ResourceModel/Generated/Elements.cs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
2-
// The .NET Foundation licenses this file to you under the MIT license.
3-
// See the LICENSE file in the project root for more information.
4-
5-
6-
//------------------------------------------------------------------------------
1+
//------------------------------------------------------------------------------
72
// <auto-generated>
83
// This code was generated by a tool.
9-
// Runtime Version:4.0.30319.18408
4+
// Runtime Version:4.0.30319.42000
105
//
116
// Changes to this file may cause incorrect behavior and will be lost if
127
// the code is regenerated.
138
// </auto-generated>
149
//------------------------------------------------------------------------------
1510

1611
//
17-
// This source code was auto-generated by xsd, Version=4.0.30319.18408.
12+
// This source code was auto-generated by xsd, Version=4.8.3928.0.
1813
//
1914
namespace MS.Internal.MilCodeGen.ResourceModel {
2015
using System.Xml.Serialization;
2116

2217

2318
/// <remarks/>
24-
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.18408")]
19+
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
2520
[System.SerializableAttribute()]
2621
[System.Diagnostics.DebuggerStepThroughAttribute()]
2722
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -73,7 +68,7 @@ public CGProperty[] Properties {
7368
}
7469

7570
/// <remarks/>
76-
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.18408")]
71+
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
7772
[System.SerializableAttribute()]
7873
[System.Diagnostics.DebuggerStepThroughAttribute()]
7974
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -147,7 +142,7 @@ public bool ImplementsIAnimatableSpecified {
147142
}
148143

149144
/// <remarks/>
150-
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.18408")]
145+
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
151146
[System.SerializableAttribute()]
152147
[System.Diagnostics.DebuggerStepThroughAttribute()]
153148
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -286,7 +281,7 @@ public string CategoryID {
286281
}
287282

288283
/// <remarks/>
289-
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.18408")]
284+
[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
290285
[System.SerializableAttribute()]
291286
[System.Diagnostics.DebuggerStepThroughAttribute()]
292287
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -411,4 +406,3 @@ public bool ReverseInheritSpecified {
411406
}
412407
}
413408
}
414-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/resources/data_generated.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,5 +617,3 @@ struct CMilBitmapCacheDuce_Data
617617
};
618618

619619
#pragma warning (pop)
620-
621-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/resources/marshal_generated.cpp‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,7 +3189,7 @@ HRESULT CMilPixelShaderDuce::ProcessUpdate(
31893189
RRETURN(hr);
31903190
}
31913191

3192-
HRESULT CMilPixelShaderDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
3192+
HRESULT CMilPixelShaderDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
31933193
{
31943194
HRESULT hr = S_OK;
31953195

@@ -3306,7 +3306,7 @@ HRESULT CMilImplicitInputBrushDuce::ProcessUpdate(
33063306
RRETURN(hr);
33073307
}
33083308

3309-
HRESULT CMilImplicitInputBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
3309+
HRESULT CMilImplicitInputBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
33103310
{
33113311
HRESULT hr = S_OK;
33123312

@@ -3384,7 +3384,7 @@ HRESULT CMilBlurEffectDuce::ProcessUpdate(
33843384
RRETURN(hr);
33853385
}
33863386

3387-
HRESULT CMilBlurEffectDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
3387+
HRESULT CMilBlurEffectDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
33883388
{
33893389
HRESULT hr = S_OK;
33903390

@@ -3537,7 +3537,7 @@ HRESULT CMilDropShadowEffectDuce::ProcessUpdate(
35373537
RRETURN(hr);
35383538
}
35393539

3540-
HRESULT CMilDropShadowEffectDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
3540+
HRESULT CMilDropShadowEffectDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
35413541
{
35423542
HRESULT hr = S_OK;
35433543

@@ -3865,7 +3865,7 @@ HRESULT CMilShaderEffectDuce::GeneratedProcessUpdate(
38653865
RRETURN(hr);
38663866
}
38673867

3868-
HRESULT CMilShaderEffectDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
3868+
HRESULT CMilShaderEffectDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
38693869
{
38703870
HRESULT hr = S_OK;
38713871

@@ -4078,7 +4078,7 @@ HRESULT CMilTransformGroupDuce::ProcessUpdate(
40784078
RRETURN(hr);
40794079
}
40804080

4081-
HRESULT CMilTransformGroupDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4081+
HRESULT CMilTransformGroupDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
40824082
{
40834083
HRESULT hr = S_OK;
40844084

@@ -4182,7 +4182,7 @@ HRESULT CMilTranslateTransformDuce::ProcessUpdate(
41824182
RRETURN(hr);
41834183
}
41844184

4185-
HRESULT CMilTranslateTransformDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4185+
HRESULT CMilTranslateTransformDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
41864186
{
41874187
HRESULT hr = S_OK;
41884188

@@ -4334,7 +4334,7 @@ HRESULT CMilScaleTransformDuce::ProcessUpdate(
43344334
RRETURN(hr);
43354335
}
43364336

4337-
HRESULT CMilScaleTransformDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4337+
HRESULT CMilScaleTransformDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
43384338
{
43394339
HRESULT hr = S_OK;
43404340

@@ -4498,7 +4498,7 @@ HRESULT CMilSkewTransformDuce::ProcessUpdate(
44984498
RRETURN(hr);
44994499
}
45004500

4501-
HRESULT CMilSkewTransformDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4501+
HRESULT CMilSkewTransformDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
45024502
{
45034503
HRESULT hr = S_OK;
45044504

@@ -4642,7 +4642,7 @@ HRESULT CMilRotateTransformDuce::ProcessUpdate(
46424642
RRETURN(hr);
46434643
}
46444644

4645-
HRESULT CMilRotateTransformDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4645+
HRESULT CMilRotateTransformDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
46464646
{
46474647
HRESULT hr = S_OK;
46484648

@@ -4740,7 +4740,7 @@ HRESULT CMilMatrixTransformDuce::ProcessUpdate(
47404740
RRETURN(hr);
47414741
}
47424742

4743-
HRESULT CMilMatrixTransformDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4743+
HRESULT CMilMatrixTransformDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
47444744
{
47454745
HRESULT hr = S_OK;
47464746

@@ -4852,7 +4852,7 @@ HRESULT CMilLineGeometryDuce::ProcessUpdate(
48524852
RRETURN(hr);
48534853
}
48544854

4855-
HRESULT CMilLineGeometryDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4855+
HRESULT CMilLineGeometryDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
48564856
{
48574857
HRESULT hr = S_OK;
48584858

@@ -4988,7 +4988,7 @@ HRESULT CMilRectangleGeometryDuce::ProcessUpdate(
49884988
RRETURN(hr);
49894989
}
49904990

4991-
HRESULT CMilRectangleGeometryDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
4991+
HRESULT CMilRectangleGeometryDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
49924992
{
49934993
HRESULT hr = S_OK;
49944994

@@ -5126,7 +5126,7 @@ HRESULT CMilEllipseGeometryDuce::ProcessUpdate(
51265126
RRETURN(hr);
51275127
}
51285128

5129-
HRESULT CMilEllipseGeometryDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
5129+
HRESULT CMilEllipseGeometryDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
51305130
{
51315131
HRESULT hr = S_OK;
51325132

@@ -5222,7 +5222,7 @@ HRESULT CMilGeometryGroupDuce::ProcessUpdate(
52225222
RRETURN(hr);
52235223
}
52245224

5225-
HRESULT CMilGeometryGroupDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
5225+
HRESULT CMilGeometryGroupDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
52265226
{
52275227
HRESULT hr = S_OK;
52285228

@@ -5349,7 +5349,7 @@ HRESULT CMilCombinedGeometryDuce::ProcessUpdate(
53495349
RRETURN(hr);
53505350
}
53515351

5352-
HRESULT CMilCombinedGeometryDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
5352+
HRESULT CMilCombinedGeometryDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
53535353
{
53545354
HRESULT hr = S_OK;
53555355

@@ -5605,7 +5605,7 @@ HRESULT CMilSolidColorBrushDuce::ProcessUpdate(
56055605
RRETURN(hr);
56065606
}
56075607

5608-
HRESULT CMilSolidColorBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
5608+
HRESULT CMilSolidColorBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
56095609
{
56105610
HRESULT hr = S_OK;
56115611

@@ -5799,7 +5799,7 @@ HRESULT CMilLinearGradientBrushDuce::ProcessUpdate(
57995799
RRETURN(hr);
58005800
}
58015801

5802-
HRESULT CMilLinearGradientBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
5802+
HRESULT CMilLinearGradientBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
58035803
{
58045804
HRESULT hr = S_OK;
58055805

@@ -6044,7 +6044,7 @@ HRESULT CMilRadialGradientBrushDuce::ProcessUpdate(
60446044
RRETURN(hr);
60456045
}
60466046

6047-
HRESULT CMilRadialGradientBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
6047+
HRESULT CMilRadialGradientBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
60486048
{
60496049
HRESULT hr = S_OK;
60506050

@@ -6246,7 +6246,7 @@ HRESULT CMilImageBrushDuce::ProcessUpdate(
62466246
RRETURN(hr);
62476247
}
62486248

6249-
HRESULT CMilImageBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
6249+
HRESULT CMilImageBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
62506250
{
62516251
HRESULT hr = S_OK;
62526252

@@ -6437,7 +6437,7 @@ HRESULT CMilDrawingBrushDuce::ProcessUpdate(
64376437
RRETURN(hr);
64386438
}
64396439

6440-
HRESULT CMilDrawingBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
6440+
HRESULT CMilDrawingBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
64416441
{
64426442
HRESULT hr = S_OK;
64436443

@@ -6628,7 +6628,7 @@ HRESULT CMilVisualBrushDuce::ProcessUpdate(
66286628
RRETURN(hr);
66296629
}
66306630

6631-
HRESULT CMilVisualBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
6631+
HRESULT CMilVisualBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
66326632
{
66336633
HRESULT hr = S_OK;
66346634

@@ -6795,7 +6795,7 @@ HRESULT CMilBitmapCacheBrushDuce::GeneratedProcessUpdate(
67956795
RRETURN(hr);
67966796
}
67976797

6798-
HRESULT CMilBitmapCacheBrushDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
6798+
HRESULT CMilBitmapCacheBrushDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
67996799
{
68006800
HRESULT hr = S_OK;
68016801

@@ -6913,7 +6913,7 @@ HRESULT CMilDashStyleDuce::ProcessUpdate(
69136913
RRETURN(hr);
69146914
}
69156915

6916-
HRESULT CMilDashStyleDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
6916+
HRESULT CMilDashStyleDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
69176917
{
69186918
HRESULT hr = S_OK;
69196919

@@ -7039,7 +7039,7 @@ HRESULT CMilPenDuce::ProcessUpdate(
70397039
RRETURN(hr);
70407040
}
70417041

7042-
HRESULT CMilPenDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7042+
HRESULT CMilPenDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
70437043
{
70447044
HRESULT hr = S_OK;
70457045

@@ -7155,7 +7155,7 @@ HRESULT CMilGeometryDrawingDuce::ProcessUpdate(
71557155
RRETURN(hr);
71567156
}
71577157

7158-
HRESULT CMilGeometryDrawingDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7158+
HRESULT CMilGeometryDrawingDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
71597159
{
71607160
HRESULT hr = S_OK;
71617161

@@ -7251,7 +7251,7 @@ HRESULT CMilGlyphRunDrawingDuce::ProcessUpdate(
72517251
RRETURN(hr);
72527252
}
72537253

7254-
HRESULT CMilGlyphRunDrawingDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7254+
HRESULT CMilGlyphRunDrawingDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
72557255
{
72567256
HRESULT hr = S_OK;
72577257

@@ -7345,7 +7345,7 @@ HRESULT CMilImageDrawingDuce::ProcessUpdate(
73457345
RRETURN(hr);
73467346
}
73477347

7348-
HRESULT CMilImageDrawingDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7348+
HRESULT CMilImageDrawingDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
73497349
{
73507350
HRESULT hr = S_OK;
73517351

@@ -7613,7 +7613,7 @@ HRESULT CMilDrawingGroupDuce::ProcessUpdate(
76137613
RRETURN(hr);
76147614
}
76157615

7616-
HRESULT CMilDrawingGroupDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7616+
HRESULT CMilDrawingGroupDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
76177617
{
76187618
HRESULT hr = S_OK;
76197619

@@ -7751,7 +7751,7 @@ HRESULT CMilGuidelineSetDuce::ProcessUpdate(
77517751
RRETURN(hr);
77527752
}
77537753

7754-
HRESULT CMilGuidelineSetDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7754+
HRESULT CMilGuidelineSetDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
77557755
{
77567756
HRESULT hr = S_OK;
77577757

@@ -7839,7 +7839,7 @@ HRESULT CMilBitmapCacheDuce::ProcessUpdate(
78397839
RRETURN(hr);
78407840
}
78417841

7842-
HRESULT CMilBitmapCacheDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTable)
7842+
HRESULT CMilBitmapCacheDuce::RegisterNotifiers(__in_ecount(1) CMilSlaveHandleTable *pHandleTable)
78437843
{
78447844
HRESULT hr = S_OK;
78457845

@@ -7854,5 +7854,3 @@ HRESULT CMilBitmapCacheDuce::RegisterNotifiers(CMilSlaveHandleTable *pHandleTabl
78547854
{
78557855
UnRegisterNotifier(m_data.m_pRenderAtScaleAnimation);
78567856
}
7857-
7858-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/resources/renderdata_generated.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,5 +490,3 @@ CMilSlaveRenderData::GetHandles(CMilSlaveHandleTable *pHandleTable)
490490
RRETURN(hr);
491491
}
492492

493-
494-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/resources/resources_generated.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,3 @@ class CMilPenDuce;
3131
class CGlyphRunResource;
3232
class CMilSlaveVideo;
3333
class CMilGuidelineSetDuce;
34-
35-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/generated_process_message.inl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
16
//---------------------------------------------------------------------------
27

38
//
@@ -3675,4 +3680,3 @@ switch(nCmdType)
36753680
IFC(WGXERR_UCE_MALFORMEDPACKET);
36763681
break;
36773682
}
3678-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/generated_resource_factory.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,5 +349,3 @@ HRESULT CResourceFactory::Create(
349349
RRETURN(hr);
350350
}
351351

352-
353-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/core/uce/generated_resource_factory.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,3 @@ class CResourceFactory
3636
__deref_out_ecount(1) CMilSlaveResource** ppResource
3737
);
3838
};
39-
40-

‎src/Microsoft.DotNet.Wpf/src/WpfGfx/exts/cmdstruct.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,3 @@ static MILCOMMAND MarshalCommands[] =
181181
/* 0x8d */ { "MILCMD_BITMAPCACHE", "milcore!MILCMD_BITMAPCACHE", false, false, 0, 0, 0 }, // MilCmdBitmapCache
182182
};
183183

184-
185-

0 commit comments

Comments
 (0)