name update to fix empty names

microsoft · Feb 17, 2025 · 593ce15 · 593ce15
1 parent 2c1ae03
commit 593ce15
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/api/Inc/midi_naming.h b/src/api/Inc/midi_naming.h
@@ -122,6 +122,11 @@ namespace WindowsMidiServicesInternal::Midi1PortNaming
             // TEMPORARY code
             name = transportSuppliedEndpointName;
 
+            if (name.empty())
+            {
+                name = blockName;
+            }
+
 
             return truncateToWinMMLimit ? name.substr(0, MAXPNAMELEN - 1) : name;
         }
@@ -172,17 +177,18 @@ namespace WindowsMidiServicesInternal::Midi1PortNaming
             return name + L" " + suffix;
         }
 
+
         // this is the fallback
 
         std::wstring name;
 
-        if (blockName != parentDeviceName)
+        if (!transportSuppliedEndpointName.empty() && blockName != transportSuppliedEndpointName)
         {
-            name = parentDeviceName + L" " + blockName;
+            name = internal::TrimmedWStringCopy(transportSuppliedEndpointName + L" " + blockName);
         }
         else
         {
-            name = parentDeviceName;
+            name = transportSuppliedEndpointName;
         }
 
         return truncateToWinMMLimit ? name.substr(0, MAXPNAMELEN - 1) : name;

diff --git a/src/api/Service/Exe/MidiDeviceManager.cpp b/src/api/Service/Exe/MidiDeviceManager.cpp
@@ -11,6 +11,10 @@
 #include "Midi2KSAggregateTransport.h"
 #include "Midi2KSTransport.h"
 #include "Midi2LoopbackMidiTransport.h"
+// naming
+#include "midi_naming.h"
+
+
 
 using namespace winrt::Windows::Devices::Enumeration;
 
@@ -2504,6 +2508,10 @@ CMidiDeviceManager::SyncMidi1Ports(
                     {
                         usePortInfoName = winrt::unbox_value<bool>(prop);
                     }
+                    else
+                    {
+                        usePortInfoName = false;
+                    }
 
                     prop = deviceInfo.Properties().Lookup(STRING_PKEY_MIDI_CustomEndpointName);
                     if (prop)

diff --git a/src/api/Service/Exe/stdafx.h b/src/api/Service/Exe/stdafx.h
@@ -80,9 +80,6 @@ namespace json = ::winrt::Windows::Data::Json;
 
 #include "WindowsMidiServices.h"
 
-// naming
-#include "midi_naming.h"
-
 // RPC Calls
 
 #include "MidiSrvRpc.h"