From 0533cdab235be351af61499d1bf49f146bcc7f35 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Wed, 27 May 2026 19:12:52 +0800 Subject: [PATCH] test: add test for default icon resource --- wfassoc-cdylib/cbindgen/wfassoc.h | 12 ++---------- wfassoc/tests/concept.rs | 6 ++++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/wfassoc-cdylib/cbindgen/wfassoc.h b/wfassoc-cdylib/cbindgen/wfassoc.h index b56bde9..6bb9d43 100644 --- a/wfassoc-cdylib/cbindgen/wfassoc.h +++ b/wfassoc-cdylib/cbindgen/wfassoc.h @@ -36,15 +36,6 @@ using CStyleString = const char*; * And we expose this type as an opaque handle for visiting your created object. */ using Token = uint64_t; -#else // __cplusplus -typedef const char *CStyleString; -typedef uint64_t Token; -#endif // __cplusplus - - -// Special treat for ICON because it may be defined by Windows header. -#ifndef _WINDEF_ -#ifdef __cplusplus /** * @brief Type representing an icon handle (opaque pointer) * @@ -52,9 +43,10 @@ typedef uint64_t Token; */ using HICON = void*; #else // __cplusplus +typedef const char *CStyleString; +typedef uint64_t Token; typedef void *HICON; #endif // __cplusplus -#endif #ifdef __cplusplus diff --git a/wfassoc/tests/concept.rs b/wfassoc/tests/concept.rs index 7088361..562d55e 100644 --- a/wfassoc/tests/concept.rs +++ b/wfassoc/tests/concept.rs @@ -186,6 +186,9 @@ fn test_str_ref_str() { #[test] fn test_icon_rc() { + fn const_tester(icon: Result) { + assert!(icon.is_ok()) + } fn ok_tester(file: &str, index: u32) { let icon = IconRc::new(file, index, IconSizeKind::Small); assert!(icon.is_ok()) @@ -195,6 +198,9 @@ fn test_icon_rc() { assert!(icon.is_err()) } + // Test 2 const value + const_tester(IconRc::GENERIC_APPLICATION(IconSizeKind::Small)); + const_tester(IconRc::GENERIC_APPLICATION(IconSizeKind::Small)); // We pick it from "jpegfile" ProgId ok_tester("imageres.dll", 72); ok_tester("notepad.exe", 0);