Support nested Windows namespace

cppwinrt/code_writers.h

@@ -1619,7 +1619,7 @@ namespace cppwinrt
         else if (optional)
         {
             auto format = R"(            if (%) *% = nullptr;
-            Windows::Foundation::IInspectable winrt_impl_%;
+            winrt::Windows::Foundation::IInspectable winrt_impl_%;
 )";
 
             w.write(format, param_name, param_name, param_name);
@@ -1961,7 +1961,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
 
         if (!found)
         {
-            w.write(", Windows::Foundation::IInspectable");
+            w.write(", winrt::Windows::Foundation::IInspectable");
         }
     }
 
@@ -2314,11 +2314,11 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
         if (empty(generics))
         {
             auto format = R"(    struct __declspec(empty_bases) % :
-        Windows::Foundation::IInspectable,
+        winrt::Windows::Foundation::IInspectable,
         impl::consume_t<%>%
     {
         %(std::nullptr_t = nullptr) noexcept {}
-        %(void* ptr, take_ownership_from_abi_t) noexcept : Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}
+        %(void* ptr, take_ownership_from_abi_t) noexcept : winrt::Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}
         %(% const&) noexcept = default;
         %(%&&) noexcept = default;
         %& operator=(% const&) & noexcept = default;
@@ -2349,11 +2349,11 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
 
             auto format = R"(    template <%>
     struct __declspec(empty_bases) % :
-        Windows::Foundation::IInspectable,
+        winrt::Windows::Foundation::IInspectable,
         impl::consume_t<%>%
     {%
         %(std::nullptr_t = nullptr) noexcept {}
-        %(void* ptr, take_ownership_from_abi_t) noexcept : Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}
+        %(void* ptr, take_ownership_from_abi_t) noexcept : winrt::Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}
         %(% const&) noexcept = default;
         %(%&&) noexcept = default;
         %& operator=(% const&) & noexcept = default;
@@ -2925,7 +2925,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
 
         auto format = R"(    inline %::%(%)
     {
-        Windows::Foundation::IInspectable %, %;
+        winrt::Windows::Foundation::IInspectable %, %;
         *this = % { return f.%(%%%, %); });
     }
 )";
@@ -3056,15 +3056,15 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
                     if (has_fastabi(type))
                     {
                         format = R"(    inline %::%() :
-        %(impl::call_factory_cast<%(*)(Windows::Foundation::IActivationFactory const&), %>([](Windows::Foundation::IActivationFactory const& f) { return impl::fast_activate<%>(f); }))
+        %(impl::call_factory_cast<%(*)(winrt::Windows::Foundation::IActivationFactory const&), %>([](winrt::Windows::Foundation::IActivationFactory const& f) { return impl::fast_activate<%>(f); }))
     {
     }
 )";
                     }
                     else
                     {
                         format = R"(    inline %::%() :
-        %(impl::call_factory_cast<%(*)(Windows::Foundation::IActivationFactory const&), %>([](Windows::Foundation::IActivationFactory const& f) { return f.template ActivateInstance<%>(); }))
+        %(impl::call_factory_cast<%(*)(winrt::Windows::Foundation::IActivationFactory const&), %>([](winrt::Windows::Foundation::IActivationFactory const& f) { return f.template ActivateInstance<%>(); }))
     {
     }
 )";

cppwinrt/component_writers.h

@@ -347,7 +347,7 @@ catch (...) { return winrt::to_hresult(); }
 
         if (!default_constructor)
         {
-            w.write(R"(        [[noreturn]] Windows::Foundation::IInspectable ActivateInstance() const
+            w.write(R"(        [[noreturn]] winrt::Windows::Foundation::IInspectable ActivateInstance() const
         {
             throw hresult_not_implemented();
         }
@@ -831,7 +831,7 @@ catch (...) { return winrt::to_hresult(); }
             auto format = R"(namespace winrt::@::factory_implementation
 {
     template <typename D, typename T, typename... I>
-    struct __declspec(empty_bases) %T : implements<D, Windows::Foundation::IActivationFactory%, I...>
+    struct __declspec(empty_bases) %T : implements<D, winrt::Windows::Foundation::IActivationFactory%, I...>
     {
         using instance_type = @::%;
 

cppwinrt/type_writers.h

@@ -504,7 +504,7 @@ namespace cppwinrt
                         }
                         else
                         {
-                            write("Windows::Foundation::IInspectable");
+                            write("winrt::Windows::Foundation::IInspectable");
                         }
                     }
                     else

test/test_component/Windows.Class.cpp

@@ -0,0 +1,15 @@
+#include "pch.h"
+#include "Windows.Class.h"
+#include "Windows.Class.g.cpp"
+
+namespace winrt::test_component::Windows::implementation
+{
+    void Class::StaticMethod()
+    {
+        throw hresult_not_implemented();
+    }
+    void Class::Method()
+    {
+        throw hresult_not_implemented();
+    }
+}

test/test_component/Windows.Class.h

@@ -0,0 +1,19 @@
+#pragma once
+#include "Windows.Class.g.h"
+
+namespace winrt::test_component::Windows::implementation
+{
+    struct Class : ClassT<Class>
+    {
+        Class() = default;
+
+        static void StaticMethod();
+        void Method();
+    };
+}
+namespace winrt::test_component::Windows::factory_implementation
+{
+    struct Class : ClassT<Class, implementation::Class>
+    {
+    };
+}

test/test_component/test_component.idl

@@ -277,4 +277,14 @@ namespace test_component
             }
         }
     }
+
+    namespace Windows
+    {
+        runtimeclass Class
+        {
+            Class();
+            static void StaticMethod();
+            void Method();
+        }
+    }
 }

test/test_component/test_component.vcxproj

@@ -620,6 +620,7 @@
     <ClCompile Include="Velocity.Class1.cpp" />
     <ClCompile Include="Velocity.Class2.cpp" />
     <ClCompile Include="Velocity.Class4.cpp" />
+    <ClCompile Include="Windows.Class.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Class.h" />
@@ -628,6 +629,7 @@
     <ClInclude Include="Velocity.Class1.h" />
     <ClInclude Include="Velocity.Class2.h" />
     <ClInclude Include="Velocity.Class4.h" />
+    <ClInclude Include="Windows.Class.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="exports.def" />