Avoid major windows crate dependency

.github/README.md

@@ -6,29 +6,24 @@ The Microsoft Debug Interface Access Software Development Kit (DIA SDK) provides
 access to debug information stored in program database (.pdb) files generated by
 Microsoft postcompiler tools.
 
-Start by adding `windows` and `microsoft-dia` dependencies to Cargo.toml:
+Start by adding `windows-core` and `microsoft-dia` dependencies to Cargo.toml:
 
 ```toml
-[dependencies.windows]
-version = "0.58.0"
-features = [
-    "Win32_System_Com"
-]
+[dependencies.windows-core]
+version = "0.59"
 
 [dependencies.microsoft-dia]
-version = "0.11.0"
+version = "0.11"
 ```
 
 Make use of any DIA SDK APIs as needed.
 
 ```rust
 use microsoft_dia::{nsfRegularExpression, DiaSource, IDiaDataSource, SymTagFunction};
-use windows::{core::*, Win32::System::Com::{CoInitializeEx, COINIT_MULTITHREADED}};
+use windows_core::*;
 
 fn main() -> windows::core::Result<()> {
     unsafe {
-        CoInitializeEx(None, COINIT_MULTITHREADED)?;
-
         let source: IDiaDataSource = microsoft_dia::helpers::NoRegCoCreate(s!("msdia140.dll"), &DiaSource)?;
         let executable = std::env::current_exe().unwrap();
         source.loadDataForExe(&HSTRING::from(executable.as_os_str()), None, None)?;

Cargo.toml

@@ -12,17 +12,11 @@ exclude = [".github", ".metadata", "docs", "tests"]
 [workspace]
 members = ["crates/samples/*", "crates/tests/*"]
 
-[dependencies.windows]
-version = "0.59"
-features = [
-    "Win32_System_Variant",
-    "Win32_System_LibraryLoader",
-    "Win32_System_Com_StructuredStorage",
-    "Win32_System_Ole",
-]
-
 [dependencies.windows-core]
 version = "0.59"
 
+[dependencies.windows-targets]
+version = "0.53"
+
 [build-dependencies.windows-bindgen]
 version = "0.59"

build.rs

@@ -7,8 +7,22 @@ fn main() {
         "default",
         ".windows/winmd/Microsoft.Dia.winmd",
         "--out",
-        "src/bindings.rs",
+        "src/public_bindings.rs",
+        "--flat",
         "--filter",
         "Microsoft.Dia",
     ]);
+
+    windows_bindgen::bindgen([
+        "--in",
+        "default",
+        "--out",
+        "src/helper_bindings.rs",
+        "--flat",
+        "--filter",
+        "IClassFactory",
+        "LoadLibraryExA",
+        "GetProcAddress",
+        "LOAD_WITH_ALTERED_SEARCH_PATH",
+    ]);
 }

crates/samples/checksum/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 publish = false
 
-[dependencies.windows]
-version = "0.59"
-
 [dependencies.microsoft-dia]
 path = "../../../"
+
+[dependencies.windows-core]
+version = "0.59"

crates/samples/checksum/src/main.rs

@@ -1,13 +1,8 @@
 use microsoft_dia::{nsNone, DiaSource, IDiaDataSource, SymTagCompiland};
-use windows::{
-    core::*,
-    Win32::System::Com::{CoInitializeEx, COINIT_MULTITHREADED},
-};
+use windows_core::*;
 
 fn main() -> Result<()> {
     unsafe {
-        // Initialize COM and DIA
-        CoInitializeEx(None, COINIT_MULTITHREADED).ok()?;
         let source: IDiaDataSource = microsoft_dia::helpers::NoRegCoCreate(
             s!(
                 r#"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\DIA SDK\bin\amd64\msdia140.dll"#

crates/samples/functions/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 publish = false
 
-[dependencies.windows]
-version = "0.59"
-
 [dependencies.microsoft-dia]
 path = "../../../"
+
+[dependencies.windows-core]
+version = "0.59"

crates/samples/functions/src/main.rs

@@ -1,12 +1,8 @@
 use microsoft_dia::{nsfRegularExpression, DiaSource, IDiaDataSource, SymTagFunction};
-use windows::{
-    core::*,
-    Win32::System::Com::{CoInitializeEx, COINIT_MULTITHREADED},
-};
+use windows_core::*;
 
 fn main() -> Result<()> {
     unsafe {
-        CoInitializeEx(None, COINIT_MULTITHREADED).ok()?;
         let source: IDiaDataSource = microsoft_dia::helpers::NoRegCoCreate(
             s!(
                 r#"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\DIA SDK\bin\amd64\msdia140.dll"#

crates/tests/enumerators/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.0.0"
 edition = "2021"
 publish = false
 
-[dependencies.windows]
+[dependencies.windows-core]
 version = "0.59"
 
 [dependencies.microsoft-dia]

crates/tests/enumerators/tests/tests.rs

@@ -1,15 +1,9 @@
 use microsoft_dia::{nsfRegularExpression, DiaSource, IDiaDataSource, IDiaSession, SymTagNull};
-use windows::{
-    core::*,
-    Win32::{
-        Foundation::S_OK,
-        System::Com::{CoInitializeEx, COINIT_MULTITHREADED},
-    },
-};
+use windows_core::*;
+const S_OK: HRESULT = HRESULT(0);
 
 fn get_test_session() -> Result<IDiaSession> {
     unsafe {
-        CoInitializeEx(None, COINIT_MULTITHREADED).ok()?;
         let path = if cfg!(target_arch = "x86_64") {
             s!(
                 r"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\DIA SDK\bin\amd64\msdia140.dll"