Skip to content

Add .NET 8 (coreclr) compatibility for Windows ARM64 #1803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smparkes wants to merge 1 commit into
base: master
Choose a base branch
from
+106 −69
Open

Add .NET 8 (coreclr) compatibility for Windows ARM64 #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified webview/lib/Microsoft.Web.WebView2.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file modified webview/lib/Microsoft.Web.WebView2.WinForms.dll
View file
Open in desktop
Binary file not shown.
175 changes: 106 additions & 69 deletions webview/platforms/winforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
clr.AddReference('System.Collections')
clr.AddReference('System.Threading')
clr.AddReference('System.Reflection')
if os.environ.get('PYTHONNET_RUNTIME') == 'coreclr':
clr.AddReference('Microsoft.Win32.SystemEvents')

import System.Windows.Forms as WinForms # noqa: E402
from Microsoft.Win32 import SystemEvents # noqa: E402
Expand Down Expand Up @@ -84,14 +86,17 @@ def edge_build(key_type, key, description=''):

return '0'

is_coreclr = os.environ.get('PYTHONNET_RUNTIME') == 'coreclr'
net_key = None
try:
net_key = winreg.OpenKey(
winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full'
)
version, _ = winreg.QueryValueEx(net_key, 'Release')
if not is_coreclr:
net_key = winreg.OpenKey(
winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full'
)
version, _ = winreg.QueryValueEx(net_key, 'Release')

if version < 394802: # .NET 4.6.2
return False
if version < 394802: # .NET 4.6.2
return False

build_versions = [
{
Expand Down Expand Up @@ -121,7 +126,8 @@ def edge_build(key_type, key, description=''):
except Exception as e:
logger.exception(e)
finally:
winreg.CloseKey(net_key)
if net_key is not None:
winreg.CloseKey(net_key)

return False

Expand Down Expand Up @@ -487,10 +493,8 @@ def _set_window_menu():
def create_action_item(menu_line_item):
action_item = WinForms.ToolStripMenuItem(menu_line_item.title)
# Don't run action function on main thread
action_item.Click += (
lambda _, __, menu_line_item=menu_line_item: threading.Thread(
target=menu_line_item.function
).start()
action_item.Click += lambda _, __, menu_line_item=menu_line_item: (
threading.Thread(target=menu_line_item.function).start()
)
return action_item

Expand Down Expand Up @@ -641,70 +645,103 @@ def alert(message):
WinForms.MessageBox.Show(str(message))


class OpenFolderDialog:
foldersFilter = 'Folders|\n'
flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic
windowsFormsAssembly = Assembly.LoadWithPartialName('System.Windows.Forms')
iFileDialogType = windowsFormsAssembly.GetType(
'System.Windows.Forms.FileDialogNative+IFileDialog'
)
OpenFileDialogType = windowsFormsAssembly.GetType('System.Windows.Forms.OpenFileDialog')
FileDialogType = windowsFormsAssembly.GetType('System.Windows.Forms.FileDialog')
createVistaDialogMethodInfo = OpenFileDialogType.GetMethod('CreateVistaDialog', flags)
onBeforeVistaDialogMethodInfo = OpenFileDialogType.GetMethod('OnBeforeVistaDialog', flags)
getOptionsMethodInfo = FileDialogType.GetMethod('GetOptions', flags)
setOptionsMethodInfo = iFileDialogType.GetMethod('SetOptions', flags)
fosPickFoldersBitFlag = (
windowsFormsAssembly.GetType('System.Windows.Forms.FileDialogNative+FOS')
.GetField('FOS_PICKFOLDERS')
.GetValue(None)
)
if os.environ.get('PYTHONNET_RUNTIME') != 'coreclr':

class OpenFolderDialog:
"""Folder picker dialog using FileDialogNative reflection.

Used on .NET Framework where the internal FileDialogNative types
are available. Supports multiple folder selection.
"""

vistaDialogEventsConstructorInfo = windowsFormsAssembly.GetType(
'System.Windows.Forms.FileDialog+VistaDialogEvents'
).GetConstructor(flags, None, [FileDialogType], [])
adviseMethodInfo = iFileDialogType.GetMethod('Advise')
unadviseMethodInfo = iFileDialogType.GetMethod('Unadvise')
showMethodInfo = iFileDialogType.GetMethod('Show')

@classmethod
def show(cls, parent=None, initialDirectory=None, allow_multiple=False, title=None):
openFileDialog = WinForms.OpenFileDialog()
openFileDialog.InitialDirectory = initialDirectory
openFileDialog.Title = title
openFileDialog.Filter = OpenFolderDialog.foldersFilter
openFileDialog.AddExtension = False
openFileDialog.CheckFileExists = False
openFileDialog.DereferenceLinks = True
openFileDialog.Multiselect = allow_multiple
openFileDialog.RestoreDirectory = True

iFileDialog = OpenFolderDialog.createVistaDialogMethodInfo.Invoke(openFileDialog, [])
OpenFolderDialog.onBeforeVistaDialogMethodInfo.Invoke(openFileDialog, [iFileDialog])
options = OpenFolderDialog.getOptionsMethodInfo.Invoke(openFileDialog, [])
options = options.op_BitwiseOr(OpenFolderDialog.fosPickFoldersBitFlag)
OpenFolderDialog.setOptionsMethodInfo.Invoke(iFileDialog, [options])
adviseParametersWithOutputConnectionToken = Array[Object](
[
OpenFolderDialog.vistaDialogEventsConstructorInfo.Invoke([openFileDialog]),
UInt32(0),
]
foldersFilter = 'Folders|\n'
flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic
windowsFormsAssembly = Assembly.LoadWithPartialName('System.Windows.Forms')
iFileDialogType = windowsFormsAssembly.GetType(
'System.Windows.Forms.FileDialogNative+IFileDialog'
)
OpenFolderDialog.adviseMethodInfo.Invoke(
iFileDialog, adviseParametersWithOutputConnectionToken
OpenFileDialogType = windowsFormsAssembly.GetType('System.Windows.Forms.OpenFileDialog')
FileDialogType = windowsFormsAssembly.GetType('System.Windows.Forms.FileDialog')
createVistaDialogMethodInfo = OpenFileDialogType.GetMethod('CreateVistaDialog', flags)
onBeforeVistaDialogMethodInfo = OpenFileDialogType.GetMethod('OnBeforeVistaDialog', flags)
getOptionsMethodInfo = FileDialogType.GetMethod('GetOptions', flags)
setOptionsMethodInfo = iFileDialogType.GetMethod('SetOptions', flags)
fosPickFoldersBitFlag = (
windowsFormsAssembly.GetType('System.Windows.Forms.FileDialogNative+FOS')
.GetField('FOS_PICKFOLDERS')
.GetValue(None)
)
dwCookie = adviseParametersWithOutputConnectionToken.GetValue(1)
try:
result = OpenFolderDialog.showMethodInfo.Invoke(
iFileDialog, [parent.Handle if parent else None]

vistaDialogEventsConstructorInfo = windowsFormsAssembly.GetType(
'System.Windows.Forms.FileDialog+VistaDialogEvents'
).GetConstructor(flags, None, [FileDialogType], [])
adviseMethodInfo = iFileDialogType.GetMethod('Advise')
unadviseMethodInfo = iFileDialogType.GetMethod('Unadvise')
showMethodInfo = iFileDialogType.GetMethod('Show')

@classmethod
def show(cls, parent=None, initialDirectory=None, allow_multiple=False, title=None):
openFileDialog = WinForms.OpenFileDialog()
openFileDialog.InitialDirectory = initialDirectory
openFileDialog.Title = title
openFileDialog.Filter = OpenFolderDialog.foldersFilter
openFileDialog.AddExtension = False
openFileDialog.CheckFileExists = False
openFileDialog.DereferenceLinks = True
openFileDialog.Multiselect = allow_multiple
openFileDialog.RestoreDirectory = True

iFileDialog = OpenFolderDialog.createVistaDialogMethodInfo.Invoke(openFileDialog, [])
OpenFolderDialog.onBeforeVistaDialogMethodInfo.Invoke(openFileDialog, [iFileDialog])
options = OpenFolderDialog.getOptionsMethodInfo.Invoke(openFileDialog, [])
options = options.op_BitwiseOr(OpenFolderDialog.fosPickFoldersBitFlag)
OpenFolderDialog.setOptionsMethodInfo.Invoke(iFileDialog, [options])
adviseParametersWithOutputConnectionToken = Array[Object](
[
OpenFolderDialog.vistaDialogEventsConstructorInfo.Invoke([openFileDialog]),
UInt32(0),
]
)
OpenFolderDialog.adviseMethodInfo.Invoke(
iFileDialog, adviseParametersWithOutputConnectionToken
)
if result == 0:
return tuple(openFileDialog.FileNames)
dwCookie = adviseParametersWithOutputConnectionToken.GetValue(1)
try:
result = OpenFolderDialog.showMethodInfo.Invoke(
iFileDialog, [parent.Handle if parent else None]
)
if result == 0:
return tuple(openFileDialog.FileNames)

return None
return None

finally:
OpenFolderDialog.unadviseMethodInfo.Invoke(iFileDialog, [UInt32(dwCookie)])

else:

class OpenFolderDialog:
"""Folder picker dialog using FolderBrowserDialog.

finally:
OpenFolderDialog.unadviseMethodInfo.Invoke(iFileDialog, [UInt32(dwCookie)])
Used on coreclr (.NET 8) where the internal FileDialogNative types
don't exist. FolderBrowserDialog does not support multiple folder
selection; the allow_multiple parameter is accepted but ignored.
"""

@classmethod
def show(cls, parent=None, initialDirectory=None, allow_multiple=False, title=None):
dlg = WinForms.FolderBrowserDialog()
if title:
dlg.Description = title
dlg.UseDescriptionForTitle = True
if initialDirectory:
dlg.SelectedPath = initialDirectory

result = dlg.ShowDialog()
if result == WinForms.DialogResult.OK:
return (dlg.SelectedPath,)

return None


_main_window_created = Event()
Expand Down
Loading