Support nested Windows namespace (#904)

kennykerr · web-flow · commit 1935608ceb28 · 2021-03-26T11:56:02.000-07:00
diff --git a/cppwinrt/code_writers.h b/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<%>(); }))
     {
     }
 )";
diff --git a/cppwinrt/component_writers.h b/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 = @::%;
 
diff --git a/cppwinrt/type_writers.h b/cppwinrt/type_writers.h
@@ -504,7 +504,7 @@ namespace cppwinrt
                         }
                         else
                         {
-                            write("Windows::Foundation::IInspectable");
+                            write("winrt::Windows::Foundation::IInspectable");
                         }
                     }
                     else
diff --git a/test/test_component/Windows.Class.cpp b/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();
+    }
+}
diff --git a/test/test_component/Windows.Class.h b/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>
+    {
+    };
+}
diff --git a/test/test_component/test_component.idl b/test/test_component/test_component.idl
@@ -277,4 +277,14 @@ namespace test_component
             }
         }
     }
+
+    namespace Windows
+    {
+        runtimeclass Class
+        {
+            Class();
+            static void StaticMethod();
+            void Method();
+        }
+    }
 }
diff --git a/test/test_component/test_component.vcxproj b/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" />

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,7 @@ namespace cppwinrt`
`1619`	`1619`	`else if (optional)`
`1620`	`1620`	`{`
`1621`	`1621`	`auto format = R"( if (%) *% = nullptr;`
`1622`		`- Windows::Foundation::IInspectable winrt_impl_%;`
	`1622`	`+ winrt::Windows::Foundation::IInspectable winrt_impl_%;`
`1623`	`1623`	`)";`
`1624`	`1624`
`1625`	`1625`	`w.write(format, param_name, param_name, param_name);`
`@@ -1961,7 +1961,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>`
`1961`	`1961`
`1962`	`1962`	`if (!found)`
`1963`	`1963`	`{`
`1964`		`- w.write(", Windows::Foundation::IInspectable");`
	`1964`	`+ w.write(", winrt::Windows::Foundation::IInspectable");`
`1965`	`1965`	`}`
`1966`	`1966`	`}`
`1967`	`1967`
`@@ -2314,11 +2314,11 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>`
`2314`	`2314`	`if (empty(generics))`
`2315`	`2315`	`{`
`2316`	`2316`	`auto format = R"( struct __declspec(empty_bases) % :`
`2317`		`- Windows::Foundation::IInspectable,`
	`2317`	`+ winrt::Windows::Foundation::IInspectable,`
`2318`	`2318`	`impl::consume_t<%>%`
`2319`	`2319`	`{`
`2320`	`2320`	`%(std::nullptr_t = nullptr) noexcept {}`
`2321`		`- %(void* ptr, take_ownership_from_abi_t) noexcept : Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}`
	`2321`	`+ %(void* ptr, take_ownership_from_abi_t) noexcept : winrt::Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}`
`2322`	`2322`	`%(% const&) noexcept = default;`
`2323`	`2323`	`%(%&&) noexcept = default;`
`2324`	`2324`	`%& operator=(% const&) & noexcept = default;`
`@@ -2349,11 +2349,11 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>`
`2349`	`2349`
`2350`	`2350`	`auto format = R"( template <%>`
`2351`	`2351`	`struct __declspec(empty_bases) % :`
`2352`		`- Windows::Foundation::IInspectable,`
	`2352`	`+ winrt::Windows::Foundation::IInspectable,`
`2353`	`2353`	`impl::consume_t<%>%`
`2354`	`2354`	`{%`
`2355`	`2355`	`%(std::nullptr_t = nullptr) noexcept {}`
`2356`		`- %(void* ptr, take_ownership_from_abi_t) noexcept : Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}`
	`2356`	`+ %(void* ptr, take_ownership_from_abi_t) noexcept : winrt::Windows::Foundation::IInspectable(ptr, take_ownership_from_abi) {}`
`2357`	`2357`	`%(% const&) noexcept = default;`
`2358`	`2358`	`%(%&&) noexcept = default;`
`2359`	`2359`	`%& operator=(% const&) & noexcept = default;`
`@@ -2925,7 +2925,7 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>`
`2925`	`2925`
`2926`	`2926`	`auto format = R"( inline %::%(%)`
`2927`	`2927`	`{`
`2928`		`- Windows::Foundation::IInspectable %, %;`
	`2928`	`+ winrt::Windows::Foundation::IInspectable %, %;`
`2929`	`2929`	`*this = % { return f.%(%%%, %); });`
`2930`	`2930`	`}`
`2931`	`2931`	`)";`
`@@ -3056,15 +3056,15 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>`
`3056`	`3056`	`if (has_fastabi(type))`
`3057`	`3057`	`{`
`3058`	`3058`	`format = R"( inline %::%() :`
`3059`		`- %(impl::call_factory_cast<%(*)(Windows::Foundation::IActivationFactory const&), %>([](Windows::Foundation::IActivationFactory const& f) { return impl::fast_activate<%>(f); }))`
	`3059`	`+ %(impl::call_factory_cast<%(*)(winrt::Windows::Foundation::IActivationFactory const&), %>([](winrt::Windows::Foundation::IActivationFactory const& f) { return impl::fast_activate<%>(f); }))`
`3060`	`3060`	`{`
`3061`	`3061`	`}`
`3062`	`3062`	`)";`
`3063`	`3063`	`}`
`3064`	`3064`	`else`
`3065`	`3065`	`{`
`3066`	`3066`	`format = R"( inline %::%() :`
`3067`		`- %(impl::call_factory_cast<%(*)(Windows::Foundation::IActivationFactory const&), %>([](Windows::Foundation::IActivationFactory const& f) { return f.template ActivateInstance<%>(); }))`
	`3067`	`+ %(impl::call_factory_cast<%(*)(winrt::Windows::Foundation::IActivationFactory const&), %>([](winrt::Windows::Foundation::IActivationFactory const& f) { return f.template ActivateInstance<%>(); }))`
`3068`	`3068`	`{`
`3069`	`3069`	`}`
`3070`	`3070`	`)";`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ catch (...) { return winrt::to_hresult(); }`
`347`	`347`
`348`	`348`	`if (!default_constructor)`
`349`	`349`	`{`
`350`		`- w.write(R"( [[noreturn]] Windows::Foundation::IInspectable ActivateInstance() const`
	`350`	`+ w.write(R"( [[noreturn]] winrt::Windows::Foundation::IInspectable ActivateInstance() const`
`351`	`351`	`{`
`352`	`352`	`throw hresult_not_implemented();`
`353`	`353`	`}`
`@@ -831,7 +831,7 @@ catch (...) { return winrt::to_hresult(); }`
`831`	`831`	`auto format = R"(namespace winrt::@::factory_implementation`
`832`	`832`	`{`
`833`	`833`	`template <typename D, typename T, typename... I>`
`834`		`- struct __declspec(empty_bases) %T : implements<D, Windows::Foundation::IActivationFactory%, I...>`
	`834`	`+ struct __declspec(empty_bases) %T : implements<D, winrt::Windows::Foundation::IActivationFactory%, I...>`
`835`	`835`	`{`
`836`	`836`	`using instance_type = @::%;`
`837`	`837`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ namespace cppwinrt`
`504`	`504`	`}`
`505`	`505`	`else`
`506`	`506`	`{`
`507`		`- write("Windows::Foundation::IInspectable");`
	`507`	`+ write("winrt::Windows::Foundation::IInspectable");`
`508`	`508`	`}`
`509`	`509`	`}`
`510`	`510`	`else`
Original file line number	Diff line number	Diff line change
`@@ -277,4 +277,14 @@ namespace test_component`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`	`}`
	`280`	`+`
	`281`	`+ namespace Windows`
	`282`	`+ {`
	`283`	`+ runtimeclass Class`
	`284`	`+ {`
	`285`	`+ Class();`
	`286`	`+ static void StaticMethod();`
	`287`	`+ void Method();`
	`288`	`+ }`
	`289`	`+ }`
`280`	`290`	`}`