Remove ole32.dll dependency from windows-core crate for compatibility (#3743)

kennykerr · web-flow · commit 24490bf4929d · 2025-09-04T14:07:55.000-05:00
diff --git a/crates/libs/bindgen/src/libraries.rs b/crates/libs/bindgen/src/libraries.rs
@@ -26,8 +26,7 @@ fn combine_libraries(
                 continue;
             };
 
-            // Windows libs are always produced with lower case module names.
-            let library = ty.method.module_name().to_lowercase();
+            let library = ty.method.module_name();
             let impl_map = ty.method.impl_map().unwrap();
             let flags = impl_map.flags();
             let name = impl_map.import_name().to_string();
diff --git a/crates/libs/bindgen/src/tables/method_def.rs b/crates/libs/bindgen/src/tables/method_def.rs
@@ -40,8 +40,22 @@ impl MethodDef {
             .next()
     }
 
-    pub fn module_name(&self) -> &'static str {
-        self.impl_map().map_or("", |map| map.scope().name())
+    pub fn module_name(&self) -> String {
+        const combase_functions: [&str; 5] = [
+            "CoCreateFreeThreadedMarshaler",
+            "CoIncrementMTAUsage",
+            "CoTaskMemAlloc",
+            "CoTaskMemFree",
+            "RoGetAgileReference",
+        ];
+
+        if combase_functions.contains(&self.name()) {
+            "combase.dll".to_string()
+        } else {
+            self.impl_map()
+                .map_or("", |map| map.scope().name())
+                .to_lowercase()
+        }
     }
 
     pub fn calling_convention(&self) -> &'static str {
diff --git a/crates/libs/bindgen/src/types/cpp_fn.rs b/crates/libs/bindgen/src/types/cpp_fn.rs
@@ -28,7 +28,7 @@ impl CppFn {
     }
 
     pub fn write_link(&self, config: &Config, underlying_types: bool) -> TokenStream {
-        let library = self.method.module_name().to_lowercase();
+        let library = self.method.module_name();
         let symbol = self.method.import_name();
         let name = to_ident(self.method.name());
         let abi = self.method.calling_convention();
diff --git a/crates/libs/core/src/imp/bindings.rs b/crates/libs/core/src/imp/bindings.rs
@@ -1,6 +1,6 @@
-windows_link::link!("ole32.dll" "system" fn CoIncrementMTAUsage(pcookie : *mut CO_MTA_USAGE_COOKIE) -> HRESULT);
-windows_link::link!("ole32.dll" "system" fn CoTaskMemAlloc(cb : usize) -> *mut core::ffi::c_void);
-windows_link::link!("ole32.dll" "system" fn CoTaskMemFree(pv : *const core::ffi::c_void));
+windows_link::link!("combase.dll" "system" fn CoIncrementMTAUsage(pcookie : *mut CO_MTA_USAGE_COOKIE) -> HRESULT);
+windows_link::link!("combase.dll" "system" fn CoTaskMemAlloc(cb : usize) -> *mut core::ffi::c_void);
+windows_link::link!("combase.dll" "system" fn CoTaskMemFree(pv : *const core::ffi::c_void));
 windows_link::link!("kernel32.dll" "system" fn EncodePointer(ptr : *const core::ffi::c_void) -> *mut core::ffi::c_void);
 windows_link::link!("kernel32.dll" "system" fn FreeLibrary(hlibmodule : HMODULE) -> BOOL);
 windows_link::link!("kernel32.dll" "system" fn GetProcAddress(hmodule : HMODULE, lpprocname : PCSTR) -> FARPROC);
diff --git a/crates/libs/core/src/imp/com_bindings.rs b/crates/libs/core/src/imp/com_bindings.rs
@@ -7,7 +7,7 @@ pub unsafe fn RoGetAgileReference<P2>(
 where
     P2: windows_core::Param<windows_core::IUnknown>,
 {
-    windows_link::link!("ole32.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : *const windows_core::GUID, punk : * mut core::ffi::c_void, ppagilereference : *mut * mut core::ffi::c_void) -> windows_core::HRESULT);
+    windows_link::link!("combase.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : *const windows_core::GUID, punk : * mut core::ffi::c_void, ppagilereference : *mut * mut core::ffi::c_void) -> windows_core::HRESULT);
     unsafe {
         let mut result__ = core::mem::zeroed();
         RoGetAgileReference(options, riid, punk.param().abi(), &mut result__)
diff --git a/crates/libs/core/src/imp/marshaler.rs b/crates/libs/core/src/imp/marshaler.rs
@@ -4,7 +4,7 @@ use core::ffi::c_void;
 use core::mem::{transmute, transmute_copy};
 use core::ptr::null_mut;
 
-windows_link::link!("ole32.dll" "system" fn CoCreateFreeThreadedMarshaler(punkouter: *mut c_void, ppunkmarshal: *mut *mut c_void) -> HRESULT);
+windows_link::link!("combase.dll" "system" fn CoCreateFreeThreadedMarshaler(punkouter: *mut c_void, ppunkmarshal: *mut *mut c_void) -> HRESULT);
 
 pub unsafe fn marshaler(outer: IUnknown, result: *mut *mut c_void) -> HRESULT {
     unsafe {
diff --git a/crates/libs/sys/src/Windows/Win32/System/Com/mod.rs b/crates/libs/sys/src/Windows/Win32/System/Com/mod.rs
@@ -14,7 +14,7 @@ windows_link::link!("ole32.dll" "system" fn CoAllowUnmarshalerCLSID(clsid : *con
 windows_link::link!("ole32.dll" "system" fn CoBuildVersion() -> u32);
 windows_link::link!("ole32.dll" "system" fn CoCancelCall(dwthreadid : u32, ultimeout : u32) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoCopyProxy(pproxy : * mut core::ffi::c_void, ppcopy : *mut * mut core::ffi::c_void) -> windows_sys::core::HRESULT);
-windows_link::link!("ole32.dll" "system" fn CoCreateFreeThreadedMarshaler(punkouter : * mut core::ffi::c_void, ppunkmarshal : *mut * mut core::ffi::c_void) -> windows_sys::core::HRESULT);
+windows_link::link!("combase.dll" "system" fn CoCreateFreeThreadedMarshaler(punkouter : * mut core::ffi::c_void, ppunkmarshal : *mut * mut core::ffi::c_void) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoCreateGuid(pguid : *mut windows_sys::core::GUID) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoCreateInstance(rclsid : *const windows_sys::core::GUID, punkouter : * mut core::ffi::c_void, dwclscontext : CLSCTX, riid : *const windows_sys::core::GUID, ppv : *mut *mut core::ffi::c_void) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoCreateInstanceEx(clsid : *const windows_sys::core::GUID, punkouter : * mut core::ffi::c_void, dwclsctx : CLSCTX, pserverinfo : *const COSERVERINFO, dwcount : u32, presults : *mut MULTI_QI) -> windows_sys::core::HRESULT);
@@ -47,7 +47,7 @@ windows_link::link!("ole32.dll" "system" fn CoGetPSClsid(riid : *const windows_s
 windows_link::link!("ole32.dll" "system" fn CoGetSystemSecurityPermissions(comsdtype : COMSD, ppsd : *mut super::super::Security:: PSECURITY_DESCRIPTOR) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoGetTreatAsClass(clsidold : *const windows_sys::core::GUID, pclsidnew : *mut windows_sys::core::GUID) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoImpersonateClient() -> windows_sys::core::HRESULT);
-windows_link::link!("ole32.dll" "system" fn CoIncrementMTAUsage(pcookie : *mut CO_MTA_USAGE_COOKIE) -> windows_sys::core::HRESULT);
+windows_link::link!("combase.dll" "system" fn CoIncrementMTAUsage(pcookie : *mut CO_MTA_USAGE_COOKIE) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoInitialize(pvreserved : *const core::ffi::c_void) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoInitializeEx(pvreserved : *const core::ffi::c_void, dwcoinit : u32) -> windows_sys::core::HRESULT);
 #[cfg(feature = "Win32_Security")]
@@ -80,8 +80,8 @@ windows_link::link!("ole32.dll" "system" fn CoSetCancelObject(punk : * mut core:
 windows_link::link!("ole32.dll" "system" fn CoSetProxyBlanket(pproxy : * mut core::ffi::c_void, dwauthnsvc : u32, dwauthzsvc : u32, pserverprincname : windows_sys::core::PCWSTR, dwauthnlevel : RPC_C_AUTHN_LEVEL, dwimplevel : RPC_C_IMP_LEVEL, pauthinfo : *const core::ffi::c_void, dwcapabilities : u32) -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoSuspendClassObjects() -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoSwitchCallContext(pnewobject : * mut core::ffi::c_void, ppoldobject : *mut * mut core::ffi::c_void) -> windows_sys::core::HRESULT);
-windows_link::link!("ole32.dll" "system" fn CoTaskMemAlloc(cb : usize) -> *mut core::ffi::c_void);
-windows_link::link!("ole32.dll" "system" fn CoTaskMemFree(pv : *const core::ffi::c_void));
+windows_link::link!("combase.dll" "system" fn CoTaskMemAlloc(cb : usize) -> *mut core::ffi::c_void);
+windows_link::link!("combase.dll" "system" fn CoTaskMemFree(pv : *const core::ffi::c_void));
 windows_link::link!("ole32.dll" "system" fn CoTaskMemRealloc(pv : *const core::ffi::c_void, cb : usize) -> *mut core::ffi::c_void);
 windows_link::link!("ole32.dll" "system" fn CoTestCancel() -> windows_sys::core::HRESULT);
 windows_link::link!("ole32.dll" "system" fn CoTreatAsClass(clsidold : *const windows_sys::core::GUID, clsidnew : *const windows_sys::core::GUID) -> windows_sys::core::HRESULT);
diff --git a/crates/libs/windows/src/Windows/Win32/System/Com/mod.rs b/crates/libs/windows/src/Windows/Win32/System/Com/mod.rs
@@ -99,7 +99,7 @@ pub unsafe fn CoCreateFreeThreadedMarshaler<P0>(punkouter: P0) -> windows_core::
 where
     P0: windows_core::Param<windows_core::IUnknown>,
 {
-    windows_link::link!("ole32.dll" "system" fn CoCreateFreeThreadedMarshaler(punkouter : * mut core::ffi::c_void, ppunkmarshal : *mut * mut core::ffi::c_void) -> windows_core::HRESULT);
+    windows_link::link!("combase.dll" "system" fn CoCreateFreeThreadedMarshaler(punkouter : * mut core::ffi::c_void, ppunkmarshal : *mut * mut core::ffi::c_void) -> windows_core::HRESULT);
     unsafe {
         let mut result__ = core::mem::zeroed();
         CoCreateFreeThreadedMarshaler(punkouter.param().abi(), &mut result__).and_then(|| windows_core::Type::from_abi(result__))
@@ -319,7 +319,7 @@ pub unsafe fn CoImpersonateClient() -> windows_core::Result<()> {
 }
 #[inline]
 pub unsafe fn CoIncrementMTAUsage() -> windows_core::Result<CO_MTA_USAGE_COOKIE> {
-    windows_link::link!("ole32.dll" "system" fn CoIncrementMTAUsage(pcookie : *mut CO_MTA_USAGE_COOKIE) -> windows_core::HRESULT);
+    windows_link::link!("combase.dll" "system" fn CoIncrementMTAUsage(pcookie : *mut CO_MTA_USAGE_COOKIE) -> windows_core::HRESULT);
     unsafe {
         let mut result__ = core::mem::zeroed();
         CoIncrementMTAUsage(&mut result__).map(|| result__)
@@ -545,12 +545,12 @@ where
 }
 #[inline]
 pub unsafe fn CoTaskMemAlloc(cb: usize) -> *mut core::ffi::c_void {
-    windows_link::link!("ole32.dll" "system" fn CoTaskMemAlloc(cb : usize) -> *mut core::ffi::c_void);
+    windows_link::link!("combase.dll" "system" fn CoTaskMemAlloc(cb : usize) -> *mut core::ffi::c_void);
     unsafe { CoTaskMemAlloc(cb) }
 }
 #[inline]
 pub unsafe fn CoTaskMemFree(pv: Option<*const core::ffi::c_void>) {
-    windows_link::link!("ole32.dll" "system" fn CoTaskMemFree(pv : *const core::ffi::c_void));
+    windows_link::link!("combase.dll" "system" fn CoTaskMemFree(pv : *const core::ffi::c_void));
     unsafe { CoTaskMemFree(pv.unwrap_or(core::mem::zeroed()) as _) }
 }
 #[inline]
diff --git a/crates/libs/windows/src/Windows/Win32/System/WinRT/mod.rs b/crates/libs/windows/src/Windows/Win32/System/WinRT/mod.rs
@@ -185,7 +185,7 @@ pub unsafe fn RoGetAgileReference<P2>(options: AgileReferenceOptions, riid: *con
 where
     P2: windows_core::Param<windows_core::IUnknown>,
 {
-    windows_link::link!("ole32.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : *const windows_core::GUID, punk : * mut core::ffi::c_void, ppagilereference : *mut * mut core::ffi::c_void) -> windows_core::HRESULT);
+    windows_link::link!("combase.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : *const windows_core::GUID, punk : * mut core::ffi::c_void, ppagilereference : *mut * mut core::ffi::c_void) -> windows_core::HRESULT);
     unsafe {
         let mut result__ = core::mem::zeroed();
         RoGetAgileReference(options, riid, punk.param().abi(), &mut result__).and_then(|| windows_core::Type::from_abi(result__))

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ impl CppFn {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`pub fn write_link(&self, config: &Config, underlying_types: bool) -> TokenStream {`
`31`		`- let library = self.method.module_name().to_lowercase();`
	`31`	`+ let library = self.method.module_name();`
`32`	`32`	`let symbol = self.method.import_name();`
`33`	`33`	`let name = to_ident(self.method.name());`
`34`	`34`	`let abi = self.method.calling_convention();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pub unsafe fn RoGetAgileReference<P2>(`
`7`	`7`	`where`
`8`	`8`	`P2: windows_core::Param<windows_core::IUnknown>,`
`9`	`9`	`{`
`10`		`- windows_link::link!("ole32.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : const windows_core::GUID, punk : mut core::ffi::c_void, ppagilereference : mut mut core::ffi::c_void) -> windows_core::HRESULT);`
	`10`	`+ windows_link::link!("combase.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : const windows_core::GUID, punk : mut core::ffi::c_void, ppagilereference : mut mut core::ffi::c_void) -> windows_core::HRESULT);`
`11`	`11`	`unsafe {`
`12`	`12`	`let mut result__ = core::mem::zeroed();`
`13`	`13`	`RoGetAgileReference(options, riid, punk.param().abi(), &mut result__)`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ pub unsafe fn RoGetAgileReference<P2>(options: AgileReferenceOptions, riid: *con`
`185`	`185`	`where`
`186`	`186`	`P2: windows_core::Param<windows_core::IUnknown>,`
`187`	`187`	`{`
`188`		`- windows_link::link!("ole32.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : const windows_core::GUID, punk : mut core::ffi::c_void, ppagilereference : mut mut core::ffi::c_void) -> windows_core::HRESULT);`
	`188`	`+ windows_link::link!("combase.dll" "system" fn RoGetAgileReference(options : AgileReferenceOptions, riid : const windows_core::GUID, punk : mut core::ffi::c_void, ppagilereference : mut mut core::ffi::c_void) -> windows_core::HRESULT);`
`189`	`189`	`unsafe {`
`190`	`190`	`let mut result__ = core::mem::zeroed();`
`191`	`191`	`RoGetAgileReference(options, riid, punk.param().abi(), &mut result__).and_then(\|\| windows_core::Type::from_abi(result__))`