sample

.github/workflows/clippy.yml

@@ -52,6 +52,8 @@ jobs:
         run:  cargo clippy -p sample_component_json_validator_winrt
       - name: Clippy sample_component_json_validator_winrt_client
         run:  cargo clippy -p sample_component_json_validator_winrt_client
+      - name: Clippy sample_component_json_validator_winrt_client_cpp
+        run:  cargo clippy -p sample_component_json_validator_winrt_client_cpp
       - name: Clippy sample_consent
         run:  cargo clippy -p sample_consent
       - name: Clippy sample_core_app

.github/workflows/test.yml

@@ -76,6 +76,8 @@ jobs:
         run:  cargo test -p sample_component_json_validator_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test sample_component_json_validator_winrt_client
         run:  cargo test -p sample_component_json_validator_winrt_client --target ${{ matrix.target }} ${{ matrix.etc }}
+      - name: Test sample_component_json_validator_winrt_client_cpp
+        run:  cargo test -p sample_component_json_validator_winrt_client_cpp --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test sample_consent
         run:  cargo test -p sample_consent --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test sample_core_app
@@ -154,10 +156,10 @@ jobs:
         run:  cargo test -p test_alternate_success_code --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_arch
         run:  cargo test -p test_arch --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test test_arch_feature
-        run:  cargo test -p test_arch_feature --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Clean
         run:  cargo clean
+      - name: Test test_arch_feature
+        run:  cargo test -p test_arch_feature --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_array
         run:  cargo test -p test_array --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_bcrypt
@@ -256,10 +258,10 @@ jobs:
         run:  cargo test -p test_standalone --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_string_param
         run:  cargo test -p test_string_param --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test test_structs
-        run:  cargo test -p test_structs --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Clean
         run:  cargo clean
+      - name: Test test_structs
+        run:  cargo test -p test_structs --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_sys
         run:  cargo test -p test_sys --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_targets

.gitignore

@@ -3,3 +3,4 @@
 /target
 *.lock
 *.winmd
+winrt

crates/samples/components/json_validator_winrt_client_cpp/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "sample_component_json_validator_winrt_client_cpp"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[build-dependencies]
+cc = "1.0"
+
+[build-dependencies.cppwinrt]
+path = "../../../../crates/libs/cppwinrt"
+
+[dependencies.windows-targets]
+path = "../../../../crates/libs/targets"
+
+# TODO: this causes a warning about lack of linkage target. The point is to ensure that this binary dependency is built first but 
+# Cargo doesn't respect cdylib targets. https://github.com/rust-lang/cargo/issues/7825
+[dependencies.sample_component_json_validator_winrt]
+path = "../json_validator_winrt"

crates/samples/components/json_validator_winrt_client_cpp/build.rs

@@ -0,0 +1,23 @@
+fn main() {
+    if !cfg!(target_env = "msvc") {
+        return;
+    }
+
+    println!("cargo:rerun-if-changed=src/client.cpp");
+    println!("cargo:rustc-link-lib=windows.0.52.0");
+
+    cppwinrt::cppwinrt([
+        "-in",
+        "../json_validator_winrt/sample.winmd",
+        &format!("{}\\System32\\WinMetadata", env!("windir")),
+        "-out",
+        "src",
+    ])
+    .unwrap();
+
+    cc::Build::new()
+        .cpp(true)
+        .std("c++20")
+        .file("src/client.cpp")
+        .compile("client");
+}

crates/samples/components/json_validator_winrt_client_cpp/src/client.cpp

@@ -0,0 +1,34 @@
+#include "winrt/Sample.h"
+
+using namespace winrt::Sample;
+
+extern "C" {
+    void __stdcall client() {
+        auto schema = LR"(
+{
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "age": {
+            "type": "integer"
+        }
+    }
+}
+    )";
+
+    auto value = LR"(
+{
+    "name": "Kenny",
+    "age": 21 
+}
+    )";
+
+    // Create a validator with the given schema.
+    auto validator = JsonValidator(schema);
+
+    // Validate and check the sanitized return value.
+    auto sanitized = validator.Validate(value);
+    assert(sanitized == LR"({"age":21,"name":"Kenny"})");
+    }
+}

crates/samples/components/json_validator_winrt_client_cpp/src/lib.rs

@@ -0,0 +1,11 @@
+#![cfg(target_env = "msvc")]
+
+#[test]
+fn test() {
+    extern "system" {
+        fn client();
+    }
+    unsafe {
+        client();
+    }
+}