Basic component development support (#1600)

microsoft · Mar 15, 2022 · 4a9c451 · 4a9c451
1 parent 98e50a7
commit 4a9c451
Show file tree

Hide file tree

Showing 157 changed files with 752 additions and 726 deletions.
diff --git a/crates/libs/bindgen/src/classes.rs b/crates/libs/bindgen/src/classes.rs
@@ -73,7 +73,7 @@ fn gen_class(def: &TypeDef, gen: &Gen) -> TokenStream {
         let new = if def.has_default_constructor() {
             quote! {
                 pub fn new() -> ::windows::core::Result<Self> {
-                    Self::IActivationFactory(|f| f.activate_instance::<Self>())
+                    Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
                 }
                 fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(
                     callback: F,

diff --git a/crates/libs/bindgen/src/gen.rs b/crates/libs/bindgen/src/gen.rs
@@ -11,6 +11,7 @@ pub struct Gen<'a> {
     pub min_inherit: bool,
     pub min_xaml: bool,
     pub windows_extern: bool,
+    pub component: bool,
 }
 
 impl Gen<'_> {

diff --git a/crates/libs/bindgen/src/implements.rs b/crates/libs/bindgen/src/implements.rs
@@ -1,7 +1,7 @@
 use super::*;
 
 pub fn gen(def: &TypeDef, gen: &Gen) -> TokenStream {
-    if def.kind() != TypeKind::Interface || !def.can_implement() {
+    if def.kind() != TypeKind::Interface || (!gen.component && !def.can_implement()) {
         return quote! {};
     }
 
@@ -58,7 +58,7 @@ pub fn gen(def: &TypeDef, gen: &Gen) -> TokenStream {
         // If it can be implemented but is exclusive and has no return value then
         // it is a Xaml override so give it a default implementation to make it easier
         // to override individual methods for Xaml notifications.
-        if def.is_exclusive() && method.signature(&def.generics).return_type.is_none() {
+        if !gen.component && def.is_exclusive() && method.signature(&def.generics).return_type.is_none() {
             quote! {
                 fn #name #signature {
                     ::core::result::Result::Ok(())

diff --git a/crates/libs/windows/src/Windows/AI/MachineLearning/mod.rs b/crates/libs/windows/src/Windows/AI/MachineLearning/mod.rs
@@ -2834,7 +2834,7 @@ unsafe impl ::core::marker::Sync for LearningModelSession {}
 pub struct LearningModelSessionOptions(::windows::core::IUnknown);
 impl LearningModelSessionOptions {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<LearningModelSessionOptions, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();

diff --git a/crates/libs/windows/src/Windows/ApplicationModel/AppService/mod.rs b/crates/libs/windows/src/Windows/ApplicationModel/AppService/mod.rs
@@ -145,7 +145,7 @@ unsafe impl ::windows::core::RuntimeType for AppServiceClosedStatus {
 pub struct AppServiceConnection(::windows::core::IUnknown);
 impl AppServiceConnection {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<AppServiceConnection, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();

diff --git a/crates/libs/windows/src/Windows/ApplicationModel/Appointments/mod.rs b/crates/libs/windows/src/Windows/ApplicationModel/Appointments/mod.rs
@@ -8,7 +8,7 @@ pub mod DataProvider;
 pub struct Appointment(::windows::core::IUnknown);
 impl Appointment {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<Appointment, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();
@@ -1535,7 +1535,7 @@ unsafe impl ::core::marker::Sync for AppointmentException {}
 pub struct AppointmentInvitee(::windows::core::IUnknown);
 impl AppointmentInvitee {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<AppointmentInvitee, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();
@@ -2030,7 +2030,7 @@ unsafe impl ::core::marker::Sync for AppointmentManagerForUser {}
 pub struct AppointmentOrganizer(::windows::core::IUnknown);
 impl AppointmentOrganizer {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<AppointmentOrganizer, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();
@@ -2434,7 +2434,7 @@ impl ::windows::core::RuntimeName for AppointmentProperties {
 pub struct AppointmentRecurrence(::windows::core::IUnknown);
 impl AppointmentRecurrence {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<AppointmentRecurrence, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();
@@ -3774,7 +3774,7 @@ unsafe impl ::windows::core::RuntimeType for FindAppointmentCalendarsOptions {
 pub struct FindAppointmentsOptions(::windows::core::IUnknown);
 impl FindAppointmentsOptions {
     pub fn new() -> ::windows::core::Result<Self> {
-        Self::IActivationFactory(|f| f.activate_instance::<Self>())
+        Self::IActivationFactory(|f| f.ActivateInstance::<Self>())
     }
     fn IActivationFactory<R, F: FnOnce(&::windows::core::IActivationFactory) -> ::windows::core::Result<R>>(callback: F) -> ::windows::core::Result<R> {
         static mut SHARED: ::windows::core::FactoryCache<FindAppointmentsOptions, ::windows::core::IActivationFactory> = ::windows::core::FactoryCache::new();