From e138968d71f24e8daad0ff1626aaf6be7ae078ae Mon Sep 17 00:00:00 2001 From: Chiara Mooney <34109996+chiaramooney@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:55:57 -0700 Subject: [PATCH 1/2] Add Coding Fixes to Composition Playground --- .../playground-composition/Playground-Composition.cpp | 6 +++--- .../playground-composition/Playground-Composition.vcxproj | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/playground/windows/playground-composition/Playground-Composition.cpp b/packages/playground/windows/playground-composition/Playground-Composition.cpp index 10683ddad3f..fdae99076f5 100644 --- a/packages/playground/windows/playground-composition/Playground-Composition.cpp +++ b/packages/playground/windows/playground-composition/Playground-Composition.cpp @@ -175,7 +175,8 @@ struct CompReactPackageProvider : winrt::implements { public: // IReactPackageProvider void CreatePackage(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept { - packageBuilder.AddTurboModule(L"DeviceInfo", winrt::Microsoft::ReactNative::MakeModuleProvider()); + AddAttributedModules(packageBuilder, true); + packageBuilder.AddModule(L"DeviceInfo", winrt::Microsoft::ReactNative::MakeModuleProvider()); CustomComponent::RegisterViewComponent(packageBuilder); } @@ -521,7 +522,6 @@ int RunPlayground(int showCmd, bool useWebDebugger) { windowData.get()); WINRT_VERIFY(hwnd); - winrt::check_win32(!hwnd); windowData.release(); @@ -539,7 +539,7 @@ int RunPlayground(int showCmd, bool useWebDebugger) { } } - return (int)msg.wParam; + return static_cast(msg.wParam); } _Use_decl_annotations_ int CALLBACK WinMain(HINSTANCE instance, HINSTANCE, PSTR /* commandLine */, int showCmd) { diff --git a/packages/playground/windows/playground-composition/Playground-Composition.vcxproj b/packages/playground/windows/playground-composition/Playground-Composition.vcxproj index b0e9040ef9e..62b885309ef 100644 --- a/packages/playground/windows/playground-composition/Playground-Composition.vcxproj +++ b/packages/playground/windows/playground-composition/Playground-Composition.vcxproj @@ -84,7 +84,6 @@ _DEBUG;%(PreprocessorDefinitions) - stdcpp17 From 3b6be0bbbfcb904cc31380ba9ec3e3826c4bbb10 Mon Sep 17 00:00:00 2001 From: Chiara Mooney <34109996+chiaramooney@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:05:48 -0700 Subject: [PATCH 2/2] Address Feedback --- .../windows/playground-composition/Playground-Composition.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/playground/windows/playground-composition/Playground-Composition.cpp b/packages/playground/windows/playground-composition/Playground-Composition.cpp index fdae99076f5..dd757e8a7aa 100644 --- a/packages/playground/windows/playground-composition/Playground-Composition.cpp +++ b/packages/playground/windows/playground-composition/Playground-Composition.cpp @@ -176,7 +176,6 @@ struct CompReactPackageProvider public: // IReactPackageProvider void CreatePackage(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept { AddAttributedModules(packageBuilder, true); - packageBuilder.AddModule(L"DeviceInfo", winrt::Microsoft::ReactNative::MakeModuleProvider()); CustomComponent::RegisterViewComponent(packageBuilder); }