Skip to content

[AppKit/MediaExtension/introspection] Fix issues found with introspection on Sequoia. #21587

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

Merged
rolfbjarne merged 3 commits into from
Nov 8, 2024
Merged

[AppKit/MediaExtension/introspection] Fix issues found with introspection on Sequoia. #21587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c166a7f
[MediaExtension] Mark a few fields as Notification fields.
rolfbjarne Nov 6, 2024
0690717
[AppKit] Remove extreanous NSSharingCollaborationModeRestriction.Aler…
rolfbjarne Nov 7, 2024
c773ba8
[introspection] Ignore methods that start with '_Init', aren't public…
rolfbjarne Nov 7, 2024
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
10 changes: 9 additions & 1 deletion src/appkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28757,7 +28757,15 @@ interface NSSharingCollaborationModeRestriction : NSSecureCoding, NSCopying {
string AlertRecoverySuggestionButtonTitle { get; }

[Export ("alertRecoverySuggestionButtonLaunchURL", ArgumentSemantic.Copy), NullAllowed]
NSUrl AlertRecoverySuggestionButtonLaunchUrl { get; set; }
#if XAMCORE_5_0
NSUrl AlertRecoverySuggestionButtonLaunchUrl { get; }
#else
NSUrl AlertRecoverySuggestionButtonLaunchUrl {
get;
[Obsolete ("Do not use, the native class doesn't have this setter.")]
set;
}
#endif

[Export ("initWithDisabledMode:")]
NativeHandle Constructor (NSSharingCollaborationMode disabledMode);
Expand Down
3 changes: 3 additions & 0 deletions src/mediaextension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ interface IMEVideoDecoder {}
[NoWatch, NoTV, NoiOS, Mac (15,0), NoMacCatalyst]
[Static]
interface MEVideoDecoderFields {
[Notification]
[Field ("MEVideoDecoderReadyForMoreMediaDataDidChangeNotification")]
NSString ReadyForMoreMediaDataDidChangeNotification { get; }
}
Expand Down Expand Up @@ -759,9 +760,11 @@ interface MERawProcessor
[Static]
interface MERawProcessorFields
{
[Notification]
[Field ("MERAWProcessorValuesDidChangeNotification")]
NSString ValuesDidChangeNotification { get; }

[Notification]
[Field ("MERAWProcessorReadyForMoreMediaDataDidChangeNotification")]
NSString ReadyForMoreMediaDataDidChangeNotification { get; }
}
Expand Down
17 changes: 15 additions & 2 deletions tests/introspection/ApiSelectorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,14 @@ protected virtual bool Skip (Type type, string selectorName)
}
break;
#endif // __MACCATALYST__
#if !XAMCORE_5_0
case "NSSharingCollaborationModeRestriction":
switch (selectorName) {
case "setAlertRecoverySuggestionButtonLaunchURL:":// binding mistake
return true;
}
break;
#endif
}

// old binding mistake
Expand Down Expand Up @@ -1213,8 +1221,13 @@ void CheckInit (Type t, MethodBase m, string name)
if (!init)
ReportError ("Selector {0} used on a constructor (not a method) on {1}", name, t.FullName);
} else {
if (init)
ReportError ("Selector {0} used on a method (not a constructor) on {1}", name, t.FullName);
if (init) {
var isPubliclyVisible = m.IsPublic || m.IsFamily || m.IsFamilyOrAssembly;
if (isPubliclyVisible || !m.Name.StartsWith ("_Init", StringComparison.Ordinal)) {
// ignore methods that start '_Init' and aren't publicly exposed, they're probably used by manually bound ctors.
ReportError ($"Selector {name} used on the method '{m.Name}' (not a constructor) on {t.FullName}");
}
}
}
}

Expand Down