Continue to follow partial suggestions from mingkuang.

Chuyu-Team · Jun 23, 2024 · c1685b2 · c1685b2
1 parent 5387d97
commit c1685b2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Shared/hstring_private.h b/src/Shared/hstring_private.h
@@ -51,15 +51,30 @@ namespace YY::Thunks::internal
  } HSTRING_HEADER_INTERNAL, *PHSTRING_HEADER_INTERNAL;
  static_assert(sizeof(HSTRING_HEADER) == sizeof(HSTRING_HEADER_INTERNAL));
 
+#ifdef _MSC_VER
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif
+#pragma warning(disable:4200) // zero length array
+#endif
+
  /*
  * @brief The internal structure of heap allocated Windows Runtime String.
  */
  typedef struct _STRING_OPAQUE
  {
  HSTRING_HEADER_INTERNAL Header;
  volatile INT RefCount;
- WCHAR String[ANYSIZE_ARRAY];
+ WCHAR String[0];
  } STRING_OPAQUE, *PSTRING_OPAQUE;
+
+#ifdef _MSC_VER
+#if (_MSC_VER >= 1200)
+#pragma warning(pop)
+#else
+#pragma warning(default:4200) // zero length array
+#endif
+#endif
 }
 
 #endif // !YY_THUNKS_HSTRING_PRIVATE
diff --git a/src/Thunks/api-ms-win-core-winrt-string.hpp b/src/Thunks/api-ms-win-core-winrt-string.hpp
@@ -43,7 +43,7 @@ namespace YY::Thunks
  return E_POINTER;
  }
 
- SIZE_T RequiredSize = sizeof(internal::STRING_OPAQUE) + length * sizeof(WCHAR);
+ SIZE_T RequiredSize = sizeof(internal::STRING_OPAQUE) + (length + 1) * sizeof(WCHAR);
  if (MAXUINT32 < RequiredSize)
  {
  return MEM_E_INVALID_SIZE;