From 535e90a05a5f1d4b7c61c62d43165247a4c7c5e5 Mon Sep 17 00:00:00 2001
From: Ryan Levick <me@ryanlevick.com>
Date: Thu, 17 Mar 2022 17:51:05 +0100
Subject: [PATCH] Fix bug where COM interfaces needed to be declared pub

---
 crates/libs/interface/src/lib.rs            | 3 ++-
 crates/tests/nightly_interface/tests/com.rs | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/crates/libs/interface/src/lib.rs b/crates/libs/interface/src/lib.rs
index 7caf5a771c..e0c5be0e01 100644
--- a/crates/libs/interface/src/lib.rs
+++ b/crates/libs/interface/src/lib.rs
@@ -155,6 +155,7 @@ impl Interface {
 
     /// Generates the vtable for a COM interface
     fn gen_vtable(&self, vtable_name: &syn::Ident) -> proc_macro2::TokenStream {
+        let vis = &self.visibility;
         let name = &self.name;
         let parent_vtable = self.parent_vtable();
         let parent_vtable_generics = if self.parent_is_iunknown() { quote!(Identity, OFFSET) } else { quote!(Identity, Impl, OFFSET) };
@@ -208,7 +209,7 @@ impl Interface {
         quote! {
             #[repr(C)]
             #[doc(hidden)]
-            pub struct #vtable_name {
+            #vis struct #vtable_name {
                 pub base: #parent_vtable,
                 #(#vtable_entries)*
             }
diff --git a/crates/tests/nightly_interface/tests/com.rs b/crates/tests/nightly_interface/tests/com.rs
index c6e8d53302..176c3b6241 100644
--- a/crates/tests/nightly_interface/tests/com.rs
+++ b/crates/tests/nightly_interface/tests/com.rs
@@ -4,7 +4,7 @@ use windows::{core::*, Win32::Foundation::*, Win32::System::Com::*};
 
 /// A custom declaration of implementation of `IUri`
 #[interface("a39ee748-6a27-4817-a6f2-13914bef5890")]
-pub unsafe trait ICustomUri: IUnknown {
+unsafe trait ICustomUri: IUnknown {
     unsafe fn GetPropertyBSTR(&self, property: Uri_PROPERTY, value: *mut BSTR, flags: u32) -> HRESULT;
     unsafe fn GetPropertyLength(&self) -> HRESULT;
     unsafe fn GetPropertyDWORD(&self, property: Uri_PROPERTY, value: *mut u32, flags: u32) -> HRESULT;
@@ -18,13 +18,13 @@ pub unsafe trait ICustomUri: IUnknown {
 
 /// A custom declaration of implementation of `IPersist`
 #[interface("0000010c-0000-0000-C000-000000000046")]
-pub unsafe trait ICustomPersist: IUnknown {
+unsafe trait ICustomPersist: IUnknown {
     unsafe fn GetClassID(&self, clsid: *mut GUID) -> HRESULT;
 }
 
 /// A custom declaration of implementation of `IPersistMemory`
 #[interface("BD1AE5E0-A6AE-11CE-BD37-504200C10000")]
-pub unsafe trait ICustomPersistMemory: ICustomPersist {
+unsafe trait ICustomPersistMemory: ICustomPersist {
     unsafe fn IsDirty(&self) -> HRESULT;
     unsafe fn Load(&self, input: *const core::ffi::c_void, size: u32) -> HRESULT;
     unsafe fn Save(&self, output: *mut core::ffi::c_void, clear_dirty: BOOL, size: u32) -> HRESULT;