Revert "Modularization and fixes for legacy header files and std:: prefixes (#8)"

YexuanXiao · web-flow · commit 2f0487e542d9 · 2026-02-24T04:04:18.000+08:00
This reverts commit faa8614.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,3 @@ Release
 Generated Files
 obj
 vsix/LICENSE
-_build
diff --git a/cppwinrt/file_writers.h b/cppwinrt/file_writers.h
@@ -14,7 +14,6 @@ namespace cppwinrt
             w.write(strings::base_macros);
             w.write(strings::base_types);
             w.write(strings::base_extern);
-            w.write(strings::base_source_location);
             w.write(strings::base_meta);
             w.write(strings::base_identity);
             w.write(strings::base_handle);
@@ -54,16 +53,6 @@ namespace cppwinrt
         {
             auto wrap_file_guard = wrap_open_file_guard(w, "FAST_FORWARD");
 
-            w.write(R"(// Transition: compatibility
-#ifndef WINRT_MODULE
-
-#ifndef WINRT_EXPORT
-#define WINRT_EXPORT
-#endif
-
-#endif
-)");
-
             auto const fast_abi_size = get_fastabi_size(w, classes);
 
             w.write(strings::base_fast_forward,
diff --git a/natvis/pch.h b/natvis/pch.h
@@ -14,7 +14,6 @@
 #include "base_macros.h"
 #include "base_types.h"
 #include "base_extern.h"
-#include "base_source_location.h"
 #include "base_meta.h"
 #include "base_identity.h"
 #include "base_handle.h"
diff --git a/strings/base_abi.h b/strings/base_abi.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <> struct abi<Windows::Foundation::IUnknown>
     {
diff --git a/strings/base_activation.h b/strings/base_activation.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     struct library_traits
     {
@@ -125,7 +125,7 @@ WINRT_EXPORT namespace winrt
 #define WINRT_IMPL_INTERLOCKED_READ_MEMORY_BARRIER (__dmb(_ARM64_BARRIER_ISH));
 #endif
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     inline std::int32_t interlocked_read_32(std::int32_t const volatile* target) noexcept
     {
@@ -548,7 +548,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T>
     T fast_activate(Windows::Foundation::IActivationFactory const& factory)
diff --git a/strings/base_agile_ref.h b/strings/base_agile_ref.h
@@ -47,7 +47,7 @@ WINRT_EXPORT namespace winrt
 #endif
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template<bool UseModuleLock>
     struct module_lock_updater;
diff --git a/strings/base_array.h b/strings/base_array.h
@@ -36,7 +36,7 @@ WINRT_EXPORT namespace winrt
         array_view(std::span<C, extent> span) noexcept :
             array_view(span.data(), static_cast<size_type>(span.size())) 
         {
-            WINRT_ASSERT(span.size() <= (std::numeric_limits<size_type>::max)());
+            WINRT_ASSERT(span.size() <= UINT_MAX);
         }
 
         operator std::span<T>() const noexcept
@@ -298,7 +298,7 @@ WINRT_EXPORT namespace winrt
         explicit com_array(std::span<U, extent> span) noexcept : 
             com_array(span.data(), span.data() + span.size()) 
         {
-            WINRT_ASSERT(span.size() <= (std::numeric_limits<size_type>::max)());
+            WINRT_ASSERT(span.size() <= UINT_MAX);
         }
 #endif
 
@@ -483,7 +483,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T>
     struct array_size_proxy
diff --git a/strings/base_collections.h b/strings/base_collections.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     namespace wfc = Windows::Foundation::Collections;
 
diff --git a/strings/base_collections_base.h b/strings/base_collections_base.h
@@ -1,4 +1,4 @@
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     struct nop_lock_guard {};
 
diff --git a/strings/base_collections_input_iterable.h b/strings/base_collections_input_iterable.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T, typename Container>
     struct input_iterable :
diff --git a/strings/base_collections_input_map.h b/strings/base_collections_input_map.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename K, typename V, typename Container, typename ThreadingBase>
     struct map_impl :
diff --git a/strings/base_collections_input_map_view.h b/strings/base_collections_input_map_view.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename K, typename V, typename Container>
     struct input_map_view :
diff --git a/strings/base_collections_input_vector.h b/strings/base_collections_input_vector.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T, typename Container, typename ThreadingBase>
     struct vector_impl :
diff --git a/strings/base_collections_input_vector_view.h b/strings/base_collections_input_vector_view.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T, typename Container>
     struct input_vector_view :
diff --git a/strings/base_collections_map.h b/strings/base_collections_map.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename K, typename V, typename Container>
     using multi_threaded_map = map_impl<K, V, Container, multi_threaded_collection_base>;
diff --git a/strings/base_collections_vector.h b/strings/base_collections_vector.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T, typename Container>
     using multi_threaded_vector = vector_impl<T, Container, multi_threaded_collection_base>;
diff --git a/strings/base_com_ptr.h b/strings/base_com_ptr.h
@@ -5,7 +5,7 @@ WINRT_EXPORT namespace winrt
     struct com_ptr;
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     struct capture_decay
     {
@@ -349,7 +349,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T, typename O, typename M, typename...Args>
     std::int32_t capture_to(void** result, com_ptr<O> const& object, M method, Args&& ...args)
diff --git a/strings/base_composable.h b/strings/base_composable.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename D>
     struct composable_factory
diff --git a/strings/base_coroutine_foundation.h b/strings/base_coroutine_foundation.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename Async>
     struct async_completed_handler;
@@ -309,7 +309,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename Promise>
     struct cancellation_token
diff --git a/strings/base_coroutine_threadpool.h b/strings/base_coroutine_threadpool.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     inline auto submit_threadpool_callback(void(__stdcall* callback)(void*, void* context), void* context)
     {
@@ -319,7 +319,7 @@ WINRT_EXPORT namespace winrt
     };
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     struct apartment_awaiter
     {
diff --git a/strings/base_delegate.h b/strings/base_delegate.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
 #if defined(_MSC_VER) && !defined(__clang__)
 #pragma warning(push)
diff --git a/strings/base_error.h b/strings/base_error.h
@@ -7,7 +7,7 @@
 #define WINRT_IMPL_RETURNADDRESS() nullptr
 #endif
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     struct heap_traits
     {
@@ -45,7 +45,7 @@ WINRT_EXPORT namespace winrt::impl
     {
         wchar_t const* back = message + size - 1;
 
-        while (size&& std::iswspace(*back))
+        while (size&& iswspace(*back))
         {
             --size;
             --back;
@@ -536,7 +536,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     inline hresult check_hresult_allow_bounds(hresult const result, winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current())
     {
diff --git a/strings/base_events.h b/strings/base_events.h
@@ -130,7 +130,7 @@ WINRT_EXPORT namespace winrt
     };
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename I, auto Method>
     struct event_revoker
diff --git a/strings/base_extern.h b/strings/base_extern.h
@@ -1,8 +1,8 @@
 
-WINRT_EXPORT __declspec(selectany) std::int32_t(__stdcall* winrt_to_hresult_handler)(void* address) noexcept {};
-WINRT_EXPORT __declspec(selectany) winrt::hstring(__stdcall* winrt_to_message_handler)(void* address) {};
-WINRT_EXPORT __declspec(selectany) void(__stdcall* winrt_throw_hresult_handler)(std::uint32_t lineNumber, char const* fileName, char const* functionName, void* returnAddress, winrt::hresult const result) noexcept {};
-WINRT_EXPORT __declspec(selectany) std::int32_t(__stdcall* winrt_activation_handler)(void* classId, winrt::guid const& iid, void** factory) noexcept {};
+__declspec(selectany) std::int32_t(__stdcall* winrt_to_hresult_handler)(void* address) noexcept {};
+__declspec(selectany) winrt::hstring(__stdcall* winrt_to_message_handler)(void* address) {};
+__declspec(selectany) void(__stdcall* winrt_throw_hresult_handler)(std::uint32_t lineNumber, char const* fileName, char const* functionName, void* returnAddress, winrt::hresult const result) noexcept {};
+__declspec(selectany) std::int32_t(__stdcall* winrt_activation_handler)(void* classId, winrt::guid const& iid, void** factory) noexcept {};
 
 #if defined(_MSC_VER)
 #ifdef _M_HYBRID
diff --git a/strings/base_fast_forward.h b/strings/base_fast_forward.h
@@ -28,7 +28,7 @@ static_assert(WINRT_FAST_ABI_SIZE >= %);
 
 #pragma detect_mismatch("WINRT_FAST_ABI_SIZE", WINRT_IMPL_STRING(WINRT_FAST_ABI_SIZE))
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     // Thunk definitions are in arch-specific assembly sources
 %
diff --git a/strings/base_foundation.h b/strings/base_foundation.h
@@ -100,7 +100,7 @@ WINRT_EXPORT namespace winrt::Windows::Foundation
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <> inline constexpr auto& name_v<Windows::Foundation::Point> = L"Windows.Foundation.Point";
     template <> inline constexpr auto& name_v<Windows::Foundation::Size> = L"Windows.Foundation.Size";
diff --git a/strings/base_identity.h b/strings/base_identity.h
@@ -17,7 +17,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <std::size_t Size, typename T, std::size_t... Index>
     constexpr std::array<T, Size> to_array(T const* value, std::index_sequence<Index...> const) noexcept
diff --git a/strings/base_implements.h b/strings/base_implements.h
@@ -6,7 +6,7 @@
 #endif
 #endif
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     struct marker
     {
@@ -30,7 +30,7 @@ WINRT_EXPORT namespace winrt
     struct implements;
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template<typename...T>
     using tuple_cat_t = decltype(std::tuple_cat(std::declval<T>()...));
@@ -267,7 +267,7 @@ WINRT_EXPORT namespace winrt
     }
 }
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename...> struct interface_list;
 
diff --git a/strings/base_includes.h b/strings/base_includes.h
@@ -7,11 +7,8 @@
 #include <chrono>
 #include <cstddef>
 #include <cstring>
-#include <cwchar>
-#include <cwctype>
 #include <exception>
 #include <iterator>
-#include <limits>
 #include <map>
 #include <memory>
 #include <optional>
@@ -29,16 +26,11 @@
 #include <version>
 #endif
 
-// <windowsnumerics.impl.h> pulls in large, hard-to-control legacy headers. In header builds we keep the
-// existing behavior, but in module builds it's provided by the winrt.numerics module.
-#ifndef WINRT_MODULE
 #if __has_include(<windowsnumerics.impl.h>)
 #define WINRT_IMPL_NUMERICS
 #include <directxmath.h>
 #endif
 
-#endif
-
 #ifndef WINRT_LEAN_AND_MEAN
 #include <ostream>
 #endif
diff --git a/strings/base_iterator.h b/strings/base_iterator.h
@@ -1,5 +1,5 @@
 
-WINRT_EXPORT namespace winrt::impl
+namespace winrt::impl
 {
     template <typename T>
     struct fast_iterator
diff --git a/strings/base_macros.h b/strings/base_macros.h
diff --git a/strings/base_marshaler.h b/strings/base_marshaler.h
diff --git a/strings/base_meta.h b/strings/base_meta.h
diff --git a/strings/base_natvis.h b/strings/base_natvis.h
diff --git a/strings/base_reference_produce.h b/strings/base_reference_produce.h
diff --git a/strings/base_source_location.h b/strings/base_source_location.h
diff --git a/strings/base_std_hash.h b/strings/base_std_hash.h
diff --git a/strings/base_string.h b/strings/base_string.h
diff --git a/strings/base_string_input.h b/strings/base_string_input.h
diff --git a/strings/base_string_operators.h b/strings/base_string_operators.h
diff --git a/strings/base_types.h b/strings/base_types.h
diff --git a/strings/base_windows.h b/strings/base_windows.h
diff --git a/strings/base_xaml_typename.h b/strings/base_xaml_typename.h

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-WINRT_EXPORT namespace winrt::impl`
	`2`	`+namespace winrt::impl`
`3`	`3`	`{`
`4`	`4`	`template <> struct abi<Windows::Foundation::IUnknown>`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ WINRT_EXPORT namespace winrt`
`47`	`47`	`#endif`
`48`	`48`	`}`
`49`	`49`
`50`		`-WINRT_EXPORT namespace winrt::impl`
	`50`	`+namespace winrt::impl`
`51`	`51`	`{`
`52`	`52`	`template<bool UseModuleLock>`
`53`	`53`	`struct module_lock_updater;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ WINRT_EXPORT namespace winrt`
`36`	`36`	`array_view(std::span<C, extent> span) noexcept :`
`37`	`37`	`array_view(span.data(), static_cast<size_type>(span.size()))`
`38`	`38`	`{`
`39`		`- WINRT_ASSERT(span.size() <= (std::numeric_limits<size_type>::max)());`
	`39`	`+ WINRT_ASSERT(span.size() <= UINT_MAX);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`operator std::span<T>() const noexcept`
`@@ -298,7 +298,7 @@ WINRT_EXPORT namespace winrt`
`298`	`298`	`explicit com_array(std::span<U, extent> span) noexcept :`
`299`	`299`	`com_array(span.data(), span.data() + span.size())`
`300`	`300`	`{`
`301`		`- WINRT_ASSERT(span.size() <= (std::numeric_limits<size_type>::max)());`
	`301`	`+ WINRT_ASSERT(span.size() <= UINT_MAX);`
`302`	`302`	`}`
`303`	`303`	`#endif`
`304`	`304`
`@@ -483,7 +483,7 @@ WINRT_EXPORT namespace winrt`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`
`486`		`-WINRT_EXPORT namespace winrt::impl`
	`486`	`+namespace winrt::impl`
`487`	`487`	`{`
`488`	`488`	`template <typename T>`
`489`	`489`	`struct array_size_proxy`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-WINRT_EXPORT namespace winrt::impl`
	`1`	`+namespace winrt::impl`
`2`	`2`	`{`
`3`	`3`	`struct nop_lock_guard {};`
`4`	`4`