Skip to content

Commit

Permalink
Start migrating UiaCore to CsWin32 (#10200)
Browse files Browse the repository at this point in the history
* Convert ExpandCollapseState to CsWin32

* Convert UiaClientsAreListening to Cswin32

* Convert ToggleState to Cswin32

* Remove unused Enums

* Migrate StructureChangeType to CsWin32

* Migrate RowOrColumnMajor to CsWin32

* Migrate ProviderOptions to CsWin32

* Migrate NavigationDirection to CsWin32

* Fix build errors

* Fix merge conflicts

* Fix build error
  • Loading branch information
elachlan authored Nov 1, 2023
1 parent 8fb9c2d commit 12ff6d3
Show file tree
Hide file tree
Showing 236 changed files with 2,573 additions and 2,852 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.InteropServices;
using Windows.Win32.UI.Accessibility;

internal static partial class Interop
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.InteropServices;
using Windows.Win32.UI.Accessibility;

internal static partial class Interop
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.InteropServices;
using Windows.Win32.UI.Accessibility;

internal static partial class Interop
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.InteropServices;
using UIA = Windows.Win32.UI.Accessibility;

internal static partial class Interop
{
Expand All @@ -17,7 +18,7 @@ public interface IToggleProvider
/// <summary>
/// Indicates an element's current on or off state
/// </summary>
ToggleState ToggleState { get; }
UIA.ToggleState ToggleState { get; }
}
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Runtime.InteropServices;
using Windows.Win32.UI.Accessibility;

internal partial class Interop
{
Expand Down
7 changes: 7 additions & 0 deletions src/System.Windows.Forms.Primitives/src/NativeMethods.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ EnumThreadWindows
EnumWindows
ES_*
EVENTMSG
ExpandCollapseState
EXTLOGFONTW
ExtTextOut
FDAP
Expand Down Expand Up @@ -558,6 +559,7 @@ MoveToEx
MSFTEDIT_CLASS
MsgWaitForMultipleObjectsEx
MultiByteToWideChar
NavigateDirection
NIN_*
NFR_*
NM_*
Expand Down Expand Up @@ -631,6 +633,7 @@ PRINTDLGEX_FLAGS
PROGRESS_CLASS
PROPERTYKEY
PropVariantClear
ProviderOptions
ReadClassStg
READYSTATE
RealizePalette
Expand All @@ -649,6 +652,7 @@ RevokeDragDrop
REGDB_E_CLASSNOTREG
RICH_EDIT_GET_CONTEXT_MENU_SEL_TYPE
RoundRect
RowOrColumnMajor
RPC_E_CHANGED_MODE
SAFEARRAY
SafeArrayGetRecordInfo
Expand Down Expand Up @@ -750,6 +754,7 @@ STGC
STGTY
STILL_ACTIVE
StretchDIBits
StructureChangeType
SYSBUTTONSTATES
SystemParametersInfo
SystemParametersInfoForDpi
Expand All @@ -770,6 +775,7 @@ TCN_*
TCS_*
THEME_PROPERTY_SYMBOL_ID
TILE_WINDOWS_HOW
ToggleState
TOOLTIP_FLAGS
TOOLTIPS_CLASS
TRACKBAR_CLASS
Expand All @@ -796,6 +802,7 @@ TYPEDESC
TYPEKIND
UIA_EVENT_ID
UiaAppendRuntimeId
UiaClientsAreListening
UiaGetReservedNotSupportedValue
UiaRootObjectId
UIS_*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Windows.Win32.System.Variant;
using Windows.Win32.UI.Accessibility;
using InteropUiaIRawElementProviderSimple = Interop.UiaCore.IRawElementProviderSimple;
using ProviderOptions = Interop.UiaCore.ProviderOptions;

namespace System.Windows.Forms.Primitives.Tests.Automation;

Expand Down
Loading

0 comments on commit 12ff6d3

Please sign in to comment.