Merge pull request #416 from microsoft/pete-dev

Fixed app-to-app MIDI and other IDL-change-related issues
microsoft · Oct 27, 2024 · 9bba082 · 9bba082
2 parents 04c6fdf + 53b08fc
commit 9bba082
Show file tree

Hide file tree

Showing 42 changed files with 302 additions and 224 deletions.
diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.Initialization.dll
diff --git a/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.dll b/build/staging/app-sdk/Arm64EC/Microsoft.Windows.Devices.Midi2.dll
diff --git a/build/staging/version/BundleInfo.wxi b/build/staging/version/BundleInfo.wxi
@@ -1,4 +1,4 @@
 <Include>
   <?define SetupVersionName="Developer Preview 7 Arm64" ?>
-  <?define SetupVersionNumber="1.0.1-preview.7.24297.2239" ?>
+  <?define SetupVersionNumber="1.0.1-preview.7.24301.1830" ?>
 </Include>
diff --git a/samples/cpp-winrt/basics/client-basics-cpp.vcxproj b/samples/cpp-winrt/basics/client-basics-cpp.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
-    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24297.2239</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24301.1830</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>false</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/basics/packages.config b/samples/cpp-winrt/basics/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
-  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24297.2239" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24301.1830" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj b/samples/cpp-winrt/loopback-endpoints/loopback-endpoints-cpp.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
-    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24297.2239</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24301.1830</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/loopback-endpoints/packages.config b/samples/cpp-winrt/loopback-endpoints/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
-  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24297.2239" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24301.1830" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/send-speed/packages.config b/samples/cpp-winrt/send-speed/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
-  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24297.2239" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24301.1830" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj b/samples/cpp-winrt/send-speed/send-speed-cpp.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
-    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24297.2239</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24301.1830</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/static-enum-endpoints/packages.config b/samples/cpp-winrt/static-enum-endpoints/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
-  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24297.2239" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24301.1830" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj b/samples/cpp-winrt/static-enum-endpoints/static-enum-endpoints-cpp.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
-    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24297.2239</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24301.1830</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/cpp-winrt/virtual-device-app-winui/packages.config b/samples/cpp-winrt/virtual-device-app-winui/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
-  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24297.2239" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24301.1830" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" targetFramework="native" />
   <package id="Microsoft.WindowsAppSDK" version="1.5.240607001" targetFramework="native" />

diff --git a/samples/cpp-winrt/virtual-device-app-winui/virtual-device-app-winui.vcxproj b/samples/cpp-winrt/virtual-device-app-winui/virtual-device-app-winui.vcxproj
@@ -4,7 +4,7 @@
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.756\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <PropertyGroup Label="Globals">
-    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24297.2239</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24301.1830</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <MinimalCoreWin>true</MinimalCoreWin>

diff --git a/samples/cpp-winrt/watch-endpoints/packages.config b/samples/cpp-winrt/watch-endpoints/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
-  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24297.2239" targetFramework="native" />
+  <package id="Microsoft.Windows.Devices.Midi2" version="1.0.1-preview.7.24301.1830" targetFramework="native" />
 </packages>
diff --git a/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj b/samples/cpp-winrt/watch-endpoints/watch-endpoints-cpp.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
-    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24297.2239</WindowsMidiServicesSdkPackage>
+    <WindowsMidiServicesSdkPackage>Microsoft.Windows.Devices.Midi2.1.0.1-preview.7.24301.1830</WindowsMidiServicesSdkPackage>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>

diff --git a/samples/csharp-net/basics/client-basics-cs.csproj b/samples/csharp-net/basics/client-basics-cs.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -9,9 +9,10 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
+    <!-- For versioning info: https://learn.microsoft.com/en-us/nuget/concepts/dependency-resolution#floating-versions -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
-    <PackageReference Include="Microsoft.Windows.Devices.Midi2" Version="1.0.24260.2134-preview.7" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
+    <PackageReference Include="Microsoft.Windows.Devices.Midi2" Version="*-*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/csharp-net/virtual-device-app-winui/MainWindow.xaml.cs b/samples/csharp-net/virtual-device-app-winui/MainWindow.xaml.cs
@@ -20,6 +20,7 @@
 using Microsoft.Windows.Devices.Midi2.Messages;
 using Microsoft.Windows.Devices.Midi2.Endpoints.Virtual;
 using Microsoft.Windows.Devices.Midi2.Initialization;
+using Windows.UI.Popups;
 
 
 namespace MidiSample.AppToAppMidi
@@ -37,27 +38,42 @@ public MainWindow()
         {
             this.InitializeComponent();
 
+            UpdateName.IsEnabled = false;
+            EndpointNameEntry.IsEnabled = false;
+            PadContainer.Visibility = Visibility.Collapsed;
+
+            this.SetWindowSize(500, 600);
+            this.Closed += MainWindow_Closed;
+
             if (!MidiServicesInitializer.EnsureServiceAvailable())
             {
                 // In your application, you may decide it is appropriate to fall back to an older MIDI API
                 Console.WriteLine("Windows MIDI Services is not available");
+                this.AppWindow.Title = "(MIDI not available)";
+
             }
             else
             {
                 // bootstrap the SDK runtime. Should check the return result here
                 MidiServicesInitializer.InitializeSdkRuntime();
 
-                StartVirtualDevice();
+                if (StartVirtualDevice())
+                {
+                    var notes = new byte[] { 50, 52, 53, 55, 57, 58, 60, 62, 64, 65, 67, 69, 70, 72, 74, 76 };
+                    Notes = notes.Select(n => new Note() { NoteNumber = n, Connection = _connection, GroupIndex = 0, ChannelIndex = 0 }).ToList();
 
-                var notes = new byte[] { 50, 52, 53, 55, 57, 58, 60, 62, 64, 65, 67, 69, 70, 72, 74, 76 };
+                    this.SetIsAlwaysOnTop(true);
 
-                Notes = notes.Select(n => new Note() { NoteNumber = n, Connection = _connection, GroupIndex = 0, ChannelIndex = 0 }).ToList();
+                    UpdateName.IsEnabled = true;
+                    EndpointNameEntry.IsEnabled = true;
+                    PadContainer.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    this.AppWindow.Title = "(failed to start virtual device)";
+                }
             }
 
-            this.Closed += MainWindow_Closed;
-
-            this.SetWindowSize(500, 600);
-            this.SetIsAlwaysOnTop(true);
         }
 
         private void MainWindow_Closed(object sender, WindowEventArgs args)
@@ -72,7 +88,7 @@ private void MainWindow_Closed(object sender, WindowEventArgs args)
             _session.Dispose();
         }
 
-        private void StartVirtualDevice()
+        private bool StartVirtualDevice()
         {
             try
             {
@@ -89,7 +105,7 @@ private void StartVirtualDevice()
                 if (_session == null)
                 {
                     System.Diagnostics.Debug.WriteLine("StartVirtualDevice Unable to create session");
-                    return;
+                    return false;
                 }
 
                 // create the virtual device, so we can get the endpoint device id to connect to
@@ -100,7 +116,7 @@ private void StartVirtualDevice()
                 if (_virtualDevice == null)
                 {
                     System.Diagnostics.Debug.WriteLine("StartVirtualDevice Unable to create virtual device");
-                    return;
+                    return false;
                 }
 
                 // create our device-side connection
@@ -110,7 +126,7 @@ private void StartVirtualDevice()
                 if (_connection == null)
                 {
                     System.Diagnostics.Debug.WriteLine("StartVirtualDevice failed to create connection");
-                    return;
+                    return false;
                 }
 
                 // necessary for the virtual device to participate in MIDI communication
@@ -128,17 +144,21 @@ private void StartVirtualDevice()
                     System.Diagnostics.Debug.WriteLine("Connection Opened");
 
                     this.AppWindow.Title = creationConfig.Name + ": Connected";
+
+                    return true;
                 }
                 else
                 {
                     System.Diagnostics.Debug.WriteLine("Connection Open Failed");
-                    this.AppWindow.Title = creationConfig.Name + ": (no connection)";
-                }
 
+                    return false;
+                }
             }
             catch (Exception ex)
             {
                 System.Diagnostics.Debug.WriteLine("Exception: " + ex.ToString());
+
+                return false;
             }
         }
 

diff --git a/samples/csharp-net/virtual-device-app-winui/virtual-device-app-winui-cs.csproj b/samples/csharp-net/virtual-device-app-winui/virtual-device-app-winui-cs.csproj
@@ -52,9 +52,10 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
 
+  <!-- For versioning info: https://learn.microsoft.com/en-us/nuget/concepts/dependency-resolution#floating-versions -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.3" />
-    <PackageReference Include="Microsoft.Windows.Devices.Midi2" Version="1.0.24260.2134-preview.7" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
+    <PackageReference Include="Microsoft.Windows.Devices.Midi2" Version="*-*" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
     <PackageReference Include="WinUIEx" Version="2.4.0" />

diff --git a/src/api/Abstraction/MidiSrvAbstraction/Midi2.MidiSrvConfigurationManager.cpp b/src/api/Abstraction/MidiSrvAbstraction/Midi2.MidiSrvConfigurationManager.cpp
@@ -42,29 +42,48 @@ CMidi2MidiSrvConfigurationManager::Initialize(
 
 _Use_decl_annotations_
 HRESULT
-CMidi2MidiSrvConfigurationManager::UpdateConfiguration(LPCWSTR configurationJson, LPWSTR* response)
+CMidi2MidiSrvConfigurationManager::UpdateConfiguration(LPCWSTR configurationJson, LPWSTR* responseJson)
 {
     TraceLoggingWrite(
         MidiSrvAbstractionTelemetryProvider::Provider(),
         MIDI_TRACE_EVENT_INFO,
         TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD),
         TraceLoggingLevel(WINEVENT_LEVEL_INFO),
-        TraceLoggingPointer(this, "this")
-    );
+        TraceLoggingPointer(this, "this"),
+        TraceLoggingWideString(L"Entering UpdateConfiguration", MIDI_TRACE_EVENT_MESSAGE_FIELD),
+        TraceLoggingWideString(configurationJson, "config json"),
+        TraceLoggingPointer(responseJson, "Response pointer")
+        );
 
-    wil::unique_rpc_binding bindingHandle;
+    RETURN_HR_IF_NULL(E_INVALIDARG, responseJson);
+
+    // requirement for RPC and also in case of failure
+    *responseJson = NULL;
 
-    RETURN_IF_FAILED(GetMidiSrvBindingHandle(&bindingHandle));
-    RETURN_HR_IF_NULL(E_INVALIDARG, response);
     RETURN_HR_IF_NULL(E_INVALIDARG, configurationJson);
 
+    wil::unique_rpc_binding bindingHandle;
+    RETURN_IF_FAILED(GetMidiSrvBindingHandle(&bindingHandle));
+
     RETURN_IF_FAILED([&]()
         {
             // RPC calls are placed in a lambda to work around compiler error C2712, limiting use of try/except blocks
             // with structured exception handling.
-            RpcTryExcept RETURN_IF_FAILED(MidiSrvUpdateConfiguration(bindingHandle.get(), configurationJson, response));
+            RpcTryExcept RETURN_IF_FAILED(MidiSrvUpdateConfiguration(bindingHandle.get(), configurationJson, responseJson));
             RpcExcept(I_RpcExceptionFilter(RpcExceptionCode())) RETURN_IF_FAILED(HRESULT_FROM_WIN32(RpcExceptionCode()));
             RpcEndExcept
+
+            TraceLoggingWrite(
+                MidiSrvAbstractionTelemetryProvider::Provider(),
+                MIDI_TRACE_EVENT_INFO,
+                TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD),
+                TraceLoggingLevel(WINEVENT_LEVEL_INFO),
+                TraceLoggingPointer(this, "this"),
+                TraceLoggingWideString(L"Completed RPC call", MIDI_TRACE_EVENT_MESSAGE_FIELD),
+                TraceLoggingWideString(configurationJson, "config json"),
+                TraceLoggingPointer(responseJson, "Response pointer")
+            );
+
             return S_OK;
         }());
 
@@ -84,16 +103,17 @@ CMidi2MidiSrvConfigurationManager::GetTransportList(LPWSTR* transportListJson)
         TraceLoggingPointer(this, "this")
     );
 
-    wil::unique_rpc_binding bindingHandle;
+    RETURN_HR_IF_NULL(E_INVALIDARG, transportListJson);
 
+    // requirement for RPC and also in case of failure
+    *transportListJson = NULL;
+
+    wil::unique_rpc_binding bindingHandle;
     RETURN_IF_FAILED(GetMidiSrvBindingHandle(&bindingHandle));
-    RETURN_HR_IF_NULL(E_INVALIDARG, transportListJson);
+
 
     RETURN_IF_FAILED([&]()
         {
-            // RPC requirement            
-            //*transportListJson = nullptr;
-
             // RPC calls are placed in a lambda to work around compiler error C2712, limiting use of try/except blocks
             // with structured exception handling.
             RpcTryExcept RETURN_IF_FAILED(MidiSrvGetTransportList(bindingHandle.get(), transportListJson));
@@ -118,19 +138,24 @@ CMidi2MidiSrvConfigurationManager::GetTransformList(LPWSTR* transformListJson)
         TraceLoggingPointer(this, "this")
     );
 
-    wil::unique_rpc_binding bindingHandle;
+    RETURN_HR_IF_NULL(E_INVALIDARG, transformListJson);
 
+    // requirement for RPC and also in case of failure
+    *transformListJson = NULL;
+
+    wil::unique_rpc_binding bindingHandle;
     RETURN_IF_FAILED(GetMidiSrvBindingHandle(&bindingHandle));
-    RETURN_HR_IF_NULL(E_INVALIDARG, transformListJson);
+
 
     RETURN_IF_FAILED([&]()
         {
+
             // RPC calls are placed in a lambda to work around compiler error C2712, limiting use of try/except blocks
             // with structured exception handling.
             RpcTryExcept RETURN_IF_FAILED(MidiSrvGetTransformList(bindingHandle.get(), transformListJson));
             RpcExcept(I_RpcExceptionFilter(RpcExceptionCode())) RETURN_IF_FAILED(HRESULT_FROM_WIN32(RpcExceptionCode()));
             RpcEndExcept
-                return S_OK;
+            return S_OK;
         }());
 
     return S_OK;

diff --git a/src/api/Abstraction/MidiSrvAbstraction/Midi2.MidiSrvConfigurationManager.h b/src/api/Abstraction/MidiSrvAbstraction/Midi2.MidiSrvConfigurationManager.h
@@ -17,10 +17,11 @@ class CMidi2MidiSrvConfigurationManager :
 public:
     STDMETHOD(Initialize(
         _In_ GUID transportId, 
-        _In_ IMidiDeviceManagerInterface* deviceManagerInterface, 
-        _In_ IMidiServiceConfigurationManagerInterface* midiServiceConfigurationManagerInterface));
+        _In_opt_ IMidiDeviceManagerInterface* deviceManagerInterface, 
+        _In_opt_ IMidiServiceConfigurationManagerInterface* midiServiceConfigurationManagerInterface));
 
     STDMETHOD(UpdateConfiguration(_In_ LPCWSTR configurationJson, _Out_ LPWSTR* responseJson));
+    //STDMETHOD(UpdateConfiguration(_In_ LPCWSTR configurationJson, _Inout_ BSTR* responseJson));
     STDMETHOD(Shutdown)();
 
 

diff --git a/src/api/Abstraction/MidiSrvAbstraction/Midi2.MidiSrvSessionTracker.cpp b/src/api/Abstraction/MidiSrvAbstraction/Midi2.MidiSrvSessionTracker.cpp
@@ -147,6 +147,9 @@ CMidi2MidiSrvSessionTracker::GetSessionList(
 
     RETURN_IF_FAILED([&]()
         {
+            // RPC requirement            
+            *sessionList = nullptr;
+
             // RPC calls are placed in a lambda to work around compiler error C2712, limiting use of try/except blocks
             // with structured exception handling.
             RpcTryExcept RETURN_IF_FAILED(MidiSrvGetSessionList(bindingHandle.get(), sessionList));