diff --git a/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.cpp b/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.cpp index 8cc082412..10f80202e 100644 --- a/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.cpp +++ b/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.cpp @@ -774,12 +774,9 @@ CMidi2KSMidiEndpointManager::OnDeviceAdded( __uuidof(Midi2KSAbstraction), newDeviceInterfaceId, negotiationParams, - nullptr // TODO: Provide callback function to get function blocks + this )); - - } - } else { @@ -818,6 +815,42 @@ CMidi2KSMidiEndpointManager::OnDeviceAdded( } +_Use_decl_annotations_ +HRESULT CMidi2KSMidiEndpointManager::ProtocolNegotiationCompleteCallback( + GUID transportGuid, + LPCWSTR deviceInterfaceId, + PENDPOINTPROTOCOLNEGOTIATIONRESULTS results) +{ + // this is not a centralized callback in this case, but is on the transport itself + // so no need to use the parameter here + UNREFERENCED_PARAMETER(transportGuid); + + RETURN_HR_IF_NULL(E_INVALIDARG, results); + RETURN_HR_IF_NULL(E_INVALIDARG, deviceInterfaceId); + + // iterate through returned function blocks. + + if (results->DiscoveredFunctionBlocks != nullptr && results->CountFunctionBlocksReceived > 0) + { + for (uint32_t fbIndex = 0; fbIndex < results->CountFunctionBlocksReceived; fbIndex++) + { + auto pFunctionBlock = results->DiscoveredFunctionBlocks + fbIndex; + + // TODO: use this function block information to create the compatible ports + UNREFERENCED_PARAMETER(pFunctionBlock); + } + } + else + { + // TODO: no function blocks. Fall back to group terminal blocks + // when creating MIDI 1.0 ports + } + + return S_OK; +} + + + _Use_decl_annotations_ HRESULT CMidi2KSMidiEndpointManager::OnDeviceRemoved(DeviceWatcher, DeviceInformationUpdate device) { diff --git a/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.h b/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.h index 4192fd0dd..70c61358d 100644 --- a/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.h +++ b/src/api/Abstraction/KSAbstraction/Midi2.KSMidiEndpointManager.h @@ -40,13 +40,19 @@ typedef class _MIDI_PIN_INFO class CMidi2KSMidiEndpointManager : public Microsoft::WRL::RuntimeClass< Microsoft::WRL::RuntimeClassFlags, - IMidiEndpointManager> + IMidiEndpointManager, + IMidiProtocolNegotiationCompleteCallback> { public: STDMETHOD(Initialize(_In_ IUnknown*, _In_ IUnknown*)); STDMETHOD(Cleanup)(); + STDMETHOD(ProtocolNegotiationCompleteCallback( + _In_ GUID transportGuid, + _In_ LPCWSTR deviceInterfaceId, + _In_ PENDPOINTPROTOCOLNEGOTIATIONRESULTS results)); + private: diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.cpp b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.cpp index f166320f7..0dcdb00dc 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.cpp @@ -8,7 +8,7 @@ #include "pch.h" -#include "midi2.NetworkMidiabstraction.h" +#include "midi2.NetworkMidiTransport.h" _Use_decl_annotations_ HRESULT @@ -16,13 +16,13 @@ CMidi2NetworkMidiBiDi::Initialize( LPCWSTR, PABSTRACTIONCREATIONPARAMS, DWORD *, - IMidiCallback * Callback, - LONGLONG Context, + IMidiCallback * callback, + LONGLONG context, GUID /* SessionId */ ) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -30,8 +30,8 @@ CMidi2NetworkMidiBiDi::Initialize( TraceLoggingWideString(L"Enter", MIDI_TRACE_EVENT_MESSAGE_FIELD) ); - m_Callback = Callback; - m_Context = Context; + m_callback = callback; + m_context = context; return S_OK; } @@ -40,7 +40,7 @@ HRESULT CMidi2NetworkMidiBiDi::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -48,8 +48,8 @@ CMidi2NetworkMidiBiDi::Cleanup() TraceLoggingWideString(L"Enter", MIDI_TRACE_EVENT_MESSAGE_FIELD) ); - m_Callback = nullptr; - m_Context = 0; + m_callback = nullptr; + m_context = 0; return S_OK; } @@ -57,30 +57,30 @@ CMidi2NetworkMidiBiDi::Cleanup() _Use_decl_annotations_ HRESULT CMidi2NetworkMidiBiDi::SendMidiMessage( - PVOID Message, - UINT Size, - LONGLONG Position + PVOID message, + UINT size, + LONGLONG position ) { - if (m_Callback == nullptr) + if (m_callback == nullptr) { // TODO log that callback is null return E_FAIL; } - if (Message == nullptr) + if (message == nullptr) { // TODO log that message was null return E_FAIL; } - if (Size < sizeof(uint32_t)) + if (size < sizeof(uint32_t)) { // TODO log that data was smaller than minimum UMP size return E_FAIL; } - m_Callback->Callback(Message, Size, Position, m_Context); + m_callback->Callback(message, size, position, m_context); return S_OK; diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.h b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.h index feb97536a..f49399536 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.h +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiBidi.h @@ -22,8 +22,8 @@ class CMidi2NetworkMidiBiDi : STDMETHOD(Cleanup)(); private: - IMidiCallback* m_Callback; - LONGLONG m_Context; + IMidiCallback* m_callback; + LONGLONG m_context; }; diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.cpp b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.cpp index ce8446bd6..c8609596e 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.cpp @@ -13,16 +13,16 @@ using namespace winrt::Windows::Networking; _Use_decl_annotations_ HRESULT CMidi2NetworkMidiConfigurationManager::Initialize( - GUID AbstractionId, - IUnknown* MidiDeviceManager, - IUnknown* MidiServiceConfigurationManagerInterface + GUID transportId, + IUnknown* midiDeviceManager, + IUnknown* midiServiceConfigurationManagerInterface ) { - UNREFERENCED_PARAMETER(MidiServiceConfigurationManagerInterface); + UNREFERENCED_PARAMETER(midiServiceConfigurationManagerInterface); TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -30,10 +30,10 @@ CMidi2NetworkMidiConfigurationManager::Initialize( TraceLoggingWideString(L"Enter", MIDI_TRACE_EVENT_MESSAGE_FIELD) ); - RETURN_HR_IF_NULL(E_INVALIDARG, MidiDeviceManager); - RETURN_IF_FAILED(MidiDeviceManager->QueryInterface(__uuidof(IMidiDeviceManagerInterface), (void**)&m_MidiDeviceManager)); + RETURN_HR_IF_NULL(E_INVALIDARG, midiDeviceManager); + RETURN_IF_FAILED(midiDeviceManager->QueryInterface(__uuidof(IMidiDeviceManagerInterface), (void**)&m_midiDeviceManager)); - m_abstractionId = AbstractionId; + m_transportId = transportId; return S_OK; } @@ -153,13 +153,13 @@ CMidi2NetworkMidiConfigurationManager::ValidateHostDefinition( _Use_decl_annotations_ HRESULT CMidi2NetworkMidiConfigurationManager::UpdateConfiguration( - LPCWSTR ConfigurationJsonSection, - BOOL IsFromConfigurationFile, - BSTR* Response + LPCWSTR configurationJsonSection, + BOOL isFromConfigurationFile, + BSTR* response ) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -167,10 +167,10 @@ CMidi2NetworkMidiConfigurationManager::UpdateConfiguration( TraceLoggingWideString(L"Enter", MIDI_TRACE_EVENT_MESSAGE_FIELD) ); - UNREFERENCED_PARAMETER(IsFromConfigurationFile); + UNREFERENCED_PARAMETER(isFromConfigurationFile); // if we're passed a null or empty json, we just quietly exit - if (ConfigurationJsonSection == nullptr) return S_OK; + if (configurationJsonSection == nullptr) return S_OK; // default to failure @@ -236,19 +236,19 @@ CMidi2NetworkMidiConfigurationManager::UpdateConfiguration( jsonFalse); - if (!json::JsonObject::TryParse(winrt::to_hstring(ConfigurationJsonSection), jsonObject)) + if (!json::JsonObject::TryParse(winrt::to_hstring(configurationJsonSection), jsonObject)) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_ERROR, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_ERROR), TraceLoggingPointer(this, "this"), TraceLoggingWideString(L"Failed to parse Configuration JSON", MIDI_TRACE_EVENT_MESSAGE_FIELD), - TraceLoggingWideString(ConfigurationJsonSection, "json") + TraceLoggingWideString(configurationJsonSection, "json") ); - internal::JsonStringifyObjectToOutParam(responseObject, &Response); + internal::JsonStringifyObjectToOutParam(responseObject, &response); RETURN_IF_FAILED(E_INVALIDARG); } @@ -261,7 +261,7 @@ CMidi2NetworkMidiConfigurationManager::UpdateConfiguration( // TODO: Set the response to something meaningful here - internal::JsonStringifyObjectToOutParam(responseObject, &Response); + internal::JsonStringifyObjectToOutParam(responseObject, &response); // once we enable update/delete we need to move this return S_OK; @@ -414,7 +414,7 @@ CMidi2NetworkMidiConfigurationManager::UpdateConfiguration( TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -423,7 +423,7 @@ CMidi2NetworkMidiConfigurationManager::UpdateConfiguration( ); // return the json with the information the client will need - internal::JsonStringifyObjectToOutParam(responseObject, &Response); + internal::JsonStringifyObjectToOutParam(responseObject, &response); return S_OK; } @@ -433,7 +433,7 @@ HRESULT CMidi2NetworkMidiConfigurationManager::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.h b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.h index 97137e3a3..281d89fff 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.h +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiConfigurationManager.h @@ -16,15 +16,15 @@ class CMidi2NetworkMidiConfigurationManager : { public: - STDMETHOD(Initialize(_In_ GUID AbstractionId, _In_ IUnknown* MidiDeviceManager, _In_ IUnknown* MidiServiceConfigurationManagerInterface)); - STDMETHOD(UpdateConfiguration(_In_ LPCWSTR ConfigurationJsonSection, _In_ BOOL IsFromConfigurationFile, _Out_ BSTR* Response)); + STDMETHOD(Initialize(_In_ GUID transportId, _In_ IUnknown* midiDeviceManager, _In_ IUnknown* midiServiceConfigurationManagerInterface)); + STDMETHOD(UpdateConfiguration(_In_ LPCWSTR configurationJsonSection, _In_ BOOL isFromConfigurationFile, _Out_ BSTR* Response)); STDMETHOD(Cleanup)(); STDMETHOD(ValidateHostDefinition(_In_ MidiNetworkUdpHostDefinition& definition, _Out_ winrt::hstring& errorMessage)); // STDMETHOD(ValidateClientDefinition(_In_ MidiNetworkUdpClientDefinition& definition)); private: - wil::com_ptr_nothrow m_MidiDeviceManager; + wil::com_ptr_nothrow m_midiDeviceManager; - GUID m_abstractionId; // kept for convenience + GUID m_transportId; // kept for convenience }; diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.cpp b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.cpp index 51d336e2f..fc53dc38d 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.cpp @@ -8,7 +8,7 @@ #include "pch.h" -#include "midi2.NetworkMidiAbstraction.h" +#include "midi2.NetworkMidiTransport.h" using namespace wil; using namespace Microsoft::WRL; @@ -16,18 +16,16 @@ using namespace Microsoft::WRL::Wrappers; #define MAX_DEVICE_ID_LEN 200 // size in chars -GUID AbstractionLayerGUID = __uuidof(Midi2NetworkMidiAbstraction); - _Use_decl_annotations_ HRESULT CMidi2NetworkMidiEndpointManager::Initialize( - IUnknown* MidiDeviceManager, + IUnknown* midiDeviceManager, IUnknown* /*midiEndpointProtocolManager*/ ) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -35,12 +33,12 @@ CMidi2NetworkMidiEndpointManager::Initialize( TraceLoggingWideString(L"Enter", MIDI_TRACE_EVENT_MESSAGE_FIELD) ); - RETURN_HR_IF(E_INVALIDARG, nullptr == MidiDeviceManager); + RETURN_HR_IF(E_INVALIDARG, nullptr == midiDeviceManager); - RETURN_IF_FAILED(MidiDeviceManager->QueryInterface(__uuidof(IMidiDeviceManagerInterface), (void**)&m_MidiDeviceManager)); + RETURN_IF_FAILED(midiDeviceManager->QueryInterface(__uuidof(IMidiDeviceManagerInterface), (void**)&m_midiDeviceManager)); - m_transportAbstractionId = AbstractionLayerGUID; // this is needed so MidiSrv can instantiate the correct transport - m_containerId = m_transportAbstractionId; // we use the transport ID as the container ID for convenience + m_transportId = TRANSPORT_LAYER_GUID; // this is needed so MidiSrv can instantiate the correct transport + m_containerId = m_transportId; // we use the transport ID as the container ID for convenience RETURN_IF_FAILED(CreateParentDevice()); @@ -52,7 +50,7 @@ HRESULT CMidi2NetworkMidiEndpointManager::CreateParentDevice() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -75,7 +73,7 @@ CMidi2NetworkMidiEndpointManager::CreateParentDevice() const ULONG deviceIdMaxSize = 255; wchar_t newDeviceId[deviceIdMaxSize]{ 0 }; - RETURN_IF_FAILED(m_MidiDeviceManager->ActivateVirtualParentDevice( + RETURN_IF_FAILED(m_midiDeviceManager->ActivateVirtualParentDevice( 0, nullptr, &createInfo, @@ -86,7 +84,7 @@ CMidi2NetworkMidiEndpointManager::CreateParentDevice() m_parentDeviceId = internal::NormalizeDeviceInstanceIdWStringCopy(newDeviceId); TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -117,7 +115,7 @@ HRESULT CMidi2NetworkMidiEndpointManager::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.h b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.h index 9afd93b80..825784a79 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.h +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiEndpointManager.h @@ -27,13 +27,13 @@ class CMidi2NetworkMidiEndpointManager : GUID m_containerId{}; - GUID m_transportAbstractionId{}; + GUID m_transportId{}; std::wstring m_parentDeviceId{}; HRESULT CreateParentDevice(); // HRESULT CreateEndpoint(_In_ MidiNetworkDeviceDefinition& deviceEndpoint); - wil::com_ptr_nothrow m_MidiDeviceManager; - wil::com_ptr_nothrow m_MidiProtocolManager; + wil::com_ptr_nothrow m_midiDeviceManager; + wil::com_ptr_nothrow m_midiProtocolManager; }; diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiPluginMetadataProvider.cpp b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiPluginMetadataProvider.cpp index 5689b58bb..b4a209e62 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiPluginMetadataProvider.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiPluginMetadataProvider.cpp @@ -15,7 +15,7 @@ HRESULT CMidi2NetworkMidiPluginMetadataProvider::Initialize() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -34,7 +34,7 @@ CMidi2NetworkMidiPluginMetadataProvider::GetMetadata( PABSTRACTIONMETADATA metadata) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -44,7 +44,7 @@ CMidi2NetworkMidiPluginMetadataProvider::GetMetadata( RETURN_HR_IF_NULL(E_INVALIDARG, metadata); - metadata->Id = ABSTRACTION_LAYER_GUID; + metadata->Id = TRANSPORT_LAYER_GUID; metadata->Mnemonic = TRANSPORT_CODE; internal::ResourceCopyToBSTR(IDS_PLUGIN_METADATA_NAME, &metadata->Name); @@ -69,7 +69,7 @@ HRESULT CMidi2NetworkMidiPluginMetadataProvider::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.cpp b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.cpp similarity index 70% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.cpp rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.cpp index 7683e81c3..5e95d4c4a 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.cpp @@ -11,17 +11,17 @@ _Use_decl_annotations_ HRESULT -CMidi2NetworkMidiAbstraction::Activate( - REFIID Riid, - void **Interface +CMidi2NetworkMidiTransport::Activate( + REFIID riid, + void **requestedInterface ) { - RETURN_HR_IF(E_INVALIDARG, nullptr == Interface); + RETURN_HR_IF(E_INVALIDARG, nullptr == requestedInterface); - if (__uuidof(IMidiBiDi) == Riid) + if (__uuidof(IMidiBiDi) == riid) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -31,14 +31,14 @@ CMidi2NetworkMidiAbstraction::Activate( wil::com_ptr_nothrow midiBiDi; RETURN_IF_FAILED(Microsoft::WRL::MakeAndInitialize(&midiBiDi)); - *Interface = midiBiDi.detach(); + *requestedInterface = midiBiDi.detach(); } - else if (__uuidof(IMidiEndpointManager) == Riid) + else if (__uuidof(IMidiEndpointManager) == riid) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -47,19 +47,19 @@ CMidi2NetworkMidiAbstraction::Activate( ); // check to see if this is the first time we're creating the endpoint manager. If so, create it. - if (AbstractionState::Current().GetEndpointManager() == nullptr) + if (TransportState::Current().GetEndpointManager() == nullptr) { - AbstractionState::Current().ConstructEndpointManager(); + TransportState::Current().ConstructEndpointManager(); } - RETURN_IF_FAILED(AbstractionState::Current().GetEndpointManager()->QueryInterface(Riid, Interface)); + RETURN_IF_FAILED(TransportState::Current().GetEndpointManager()->QueryInterface(riid, requestedInterface)); } - else if (__uuidof(IMidiAbstractionConfigurationManager) == Riid) + else if (__uuidof(IMidiAbstractionConfigurationManager) == riid) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -68,18 +68,18 @@ CMidi2NetworkMidiAbstraction::Activate( ); // check to see if this is the first time we're creating the configuration manager. If so, create it. - if (AbstractionState::Current().GetConfigurationManager() == nullptr) + if (TransportState::Current().GetConfigurationManager() == nullptr) { - AbstractionState::Current().ConstructConfigurationManager(); + TransportState::Current().ConstructConfigurationManager(); } - RETURN_IF_FAILED(AbstractionState::Current().GetConfigurationManager()->QueryInterface(Riid, Interface)); + RETURN_IF_FAILED(TransportState::Current().GetConfigurationManager()->QueryInterface(riid, requestedInterface)); } - else if (__uuidof(IMidiServiceAbstractionPluginMetadataProvider) == Riid) + else if (__uuidof(IMidiServiceAbstractionPluginMetadataProvider) == riid) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -89,13 +89,13 @@ CMidi2NetworkMidiAbstraction::Activate( wil::com_ptr_nothrow metadataProvider; RETURN_IF_FAILED(Microsoft::WRL::MakeAndInitialize(&metadataProvider)); - *Interface = metadataProvider.detach(); + *requestedInterface = metadataProvider.detach(); } else { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.def b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.def similarity index 100% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.def rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.def diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.h b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.h similarity index 68% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.h rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.h index 3b805ddf3..fa4de8508 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.h +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.h @@ -8,10 +8,10 @@ #pragma once -class MidiNetworkMidiAbstractionTelemetryProvider : public wil::TraceLoggingProvider +class MidiNetworkMidiTransportTelemetryProvider : public wil::TraceLoggingProvider { IMPLEMENT_TRACELOGGING_CLASS_WITH_MICROSOFT_TELEMETRY( - MidiNetworkMidiAbstractionTelemetryProvider, + MidiNetworkMidiTransportTelemetryProvider, "Microsoft.Windows.Midi2.NetworkMidiAbstraction", // ee50a899-6caf-526c-e261-1f00403716f3 from hash of name using: // PS> [System.Diagnostics.Tracing.EventSource]::new("Microsoft.Windows.Midi2.NetworkMidiAbstraction").Guid @@ -20,19 +20,19 @@ class MidiNetworkMidiAbstractionTelemetryProvider : public wil::TraceLoggingProv using namespace ATL; -class ATL_NO_VTABLE CMidi2NetworkMidiAbstraction : +class ATL_NO_VTABLE CMidi2NetworkMidiTransport : public CComObjectRootEx, - public CComCoClass, + public CComCoClass, public IMidiAbstraction { public: - CMidi2NetworkMidiAbstraction() + CMidi2NetworkMidiTransport() { } - DECLARE_REGISTRY_RESOURCEID(IDR_MIDI2NETWORKMIDIABSTRACTION) + DECLARE_REGISTRY_RESOURCEID(IDR_MIDI2NETWORKMIDITRANSPORT) - BEGIN_COM_MAP(CMidi2NetworkMidiAbstraction) + BEGIN_COM_MAP(CMidi2NetworkMidiTransport) COM_INTERFACE_ENTRY(IMidiAbstraction) END_COM_MAP() @@ -42,4 +42,4 @@ class ATL_NO_VTABLE CMidi2NetworkMidiAbstraction : private: }; -OBJECT_ENTRY_AUTO(__uuidof(Midi2NetworkMidiAbstraction), CMidi2NetworkMidiAbstraction) \ No newline at end of file +OBJECT_ENTRY_AUTO(__uuidof(Midi2NetworkMidiTransport), CMidi2NetworkMidiTransport) \ No newline at end of file diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.rc b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.rc similarity index 87% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.rc rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.rc index 4536ddd4a..5248fbd47 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.rc +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.rc @@ -41,7 +41,7 @@ END 3 TEXTINCLUDE BEGIN - "1 TYPELIB ""Midi2NetworkMidiAbstraction.tlb""\r\n" + "1 TYPELIB ""Midi2NetworkMidiTransport.tlb""\r\n" "\0" END @@ -73,8 +73,8 @@ BEGIN VALUE "FileDescription", "Windows MIDI Services Plugin" VALUE "FileVersion", "1.0.0.1" VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved." - VALUE "InternalName", "Midi2.NetworkMidiAbstraction.dll" - VALUE "OriginalFilename", "Midi2.NetworkMidiAbstraction.dll" + VALUE "InternalName", "Midi2.NetworkMidiTransport.dll" + VALUE "OriginalFilename", "Midi2.NetworkMidiTransport.dll" VALUE "ProductName", "Windows MIDI Services" VALUE "ProductVersion", "1.0.0.1" VALUE "OLESelfRegister", "" @@ -93,7 +93,7 @@ END STRINGTABLE BEGIN - IDS_PROJNAME "Midi2.NetworkMidiAbstraction" + IDS_PROJNAME "Midi2.NetworkMidiTransport" IDS_PLUGIN_METADATA_VERSION "1.0.0.0" IDS_PLUGIN_METADATA_NAME "Network MIDI 2.0 (UDP) PROTOTYPE" @@ -101,7 +101,7 @@ BEGIN IDS_PLUGIN_METADATA_AUTHOR "Microsoft" END -IDR_MIDI2NETWORKMIDIABSTRACTION REGISTRY "Midi2.NetworkMidiAbstraction.rgs" +IDR_MIDI2NETWORKMIDIABSTRACTION REGISTRY "Midi2.NetworkMidiTransport.rgs" //////////////////////////////////////////////////////////////////////////// @@ -113,7 +113,7 @@ IDR_MIDI2NETWORKMIDIABSTRACTION REGISTRY "Midi2.NetworkMidiAbstraction.rgs" // // Generated from the TEXTINCLUDE 3 resource. // -1 TYPELIB "Midi2NetworkMidiAbstraction.tlb" +1 TYPELIB "Midi2NetworkMidiTransport.tlb" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED #endif diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.rgs b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.rgs similarity index 87% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.rgs rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.rgs index 487373b24..69b09f810 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.rgs +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.rgs @@ -2,7 +2,7 @@ HKCR { NoRemove CLSID { - ForceRemove {c95dcd1f-cde3-4c2d-913c-528cb8a4cbe6} = s 'Midi2NetworkMidiAbstraction Class' + ForceRemove {c95dcd1f-cde3-4c2d-913c-528cb8a4cbe6} = s 'Midi2NetworkMidiTransport Class' { InprocServer32 = s '%MODULE%' { diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.vcxproj b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.vcxproj similarity index 93% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.vcxproj rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.vcxproj index 7c6d661c8..2f4108183 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.vcxproj +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.vcxproj @@ -148,11 +148,11 @@ %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.NetworkMidiAbstraction.def + Midi2.NetworkMidiTransport.def $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiabstraction\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiTransport\$(Platform)\$(Configuration)\ %(Filename).h @@ -166,11 +166,11 @@ %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.NetworkMidiAbstraction.def + Midi2.NetworkMidiTransport.def $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiabstraction\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiTransport\$(Platform)\$(Configuration)\ %(Filename).h @@ -184,11 +184,11 @@ %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.NetworkMidiAbstraction.def + Midi2.NetworkMidiTransport.def $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiabstraction\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiTransport\$(Platform)\$(Configuration)\ %(Filename).h @@ -221,11 +221,11 @@ %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.NetworkMidiAbstraction.def + Midi2.NetworkMidiTransport.def $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiabstraction\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiTransport\$(Platform)\$(Configuration)\ %(Filename).h @@ -238,11 +238,11 @@ %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.NetworkMidiAbstraction.def + Midi2.NetworkMidiTransport.def $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiabstraction\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiTransport\$(Platform)\$(Configuration)\ %(Filename).h @@ -265,18 +265,18 @@ %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.NetworkMidiAbstraction.def + Midi2.NetworkMidiTransport.def $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiabstraction\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\midi2.NetworkMidiTransport\$(Platform)\$(Configuration)\ %(Filename).h - + - + @@ -290,18 +290,18 @@ - + - - + + - - + + - + @@ -318,7 +318,7 @@ - + diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.vcxproj.filters b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.vcxproj.filters similarity index 89% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.vcxproj.filters rename to src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.vcxproj.filters index 96724c5a2..da8d5897e 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiAbstraction.vcxproj.filters +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2.NetworkMidiTransport.vcxproj.filters @@ -21,9 +21,6 @@ Source Files - - Source Files - Source Files @@ -33,9 +30,6 @@ Source Files - - Source Files - Source Files @@ -57,20 +51,21 @@ Source Files - - - + Source Files - + + + Source Files + - - Source Files - - + + Resource Files - + + Source Files + @@ -79,27 +74,15 @@ Header Files - - Header Files - - - Header Files - Header Files Header Files - - Header Files - Header Files - - Header Files - Header Files @@ -127,13 +110,30 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Resource Files + + + + - + Resource Files - + + Source Files + \ No newline at end of file diff --git a/src/api/Abstraction/UdpNetworkMidi2/Midi2NetworkMidiAbstraction.idl b/src/api/Abstraction/UdpNetworkMidi2/Midi2NetworkMidiTransport.idl similarity index 90% rename from src/api/Abstraction/UdpNetworkMidi2/Midi2NetworkMidiAbstraction.idl rename to src/api/Abstraction/UdpNetworkMidi2/Midi2NetworkMidiTransport.idl index 02aa7f614..5c5de4e44 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Midi2NetworkMidiAbstraction.idl +++ b/src/api/Abstraction/UdpNetworkMidi2/Midi2NetworkMidiTransport.idl @@ -16,12 +16,12 @@ import "WindowsMidiServices.idl"; uuid(4568a471-6f32-4015-b4db-9087bfb60a0b), version(1.0), ] -library Midi2NetworkMidiAbstractionLib +library Midi2NetworkMidiTransportLib { importlib("stdole2.tlb"); [uuid(c95dcd1f-cde3-4c2d-913c-528cb8a4cbe6), version(1.0)] - coclass Midi2NetworkMidiAbstraction + coclass Midi2NetworkMidiTransport { [default] interface IMidiAbstraction; } diff --git a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkAdvertiser.cpp b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkAdvertiser.cpp index 46fcf91fe..634bf041a 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkAdvertiser.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkAdvertiser.cpp @@ -12,7 +12,7 @@ HRESULT MidiNetworkAdvertiser::Initialize() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -49,7 +49,7 @@ MidiNetworkAdvertiser::Advertise( ) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -79,7 +79,7 @@ MidiNetworkAdvertiser::Advertise( // The service was not registered because security settings did not allow it. case DnssdRegistrationStatus::SecurityError: TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_ERROR, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_ERROR), @@ -93,7 +93,7 @@ MidiNetworkAdvertiser::Advertise( // The service was not registered because the service name provided is not valid. case DnssdRegistrationStatus::InvalidServiceName: TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_ERROR, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_ERROR), @@ -107,7 +107,7 @@ MidiNetworkAdvertiser::Advertise( // The service was not registered because of an error on the DNS server. case DnssdRegistrationStatus::ServerError: TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingPointer(this, "this"), @@ -119,7 +119,7 @@ MidiNetworkAdvertiser::Advertise( default: TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_ERROR, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_ERROR), @@ -138,7 +138,7 @@ HRESULT MidiNetworkAdvertiser::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClient.cpp b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClient.cpp index a20142f54..62c8e0960 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClient.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClient.cpp @@ -14,7 +14,7 @@ HRESULT MidiNetworkClient::Initialize(MidiNetworkUdpClientDefinition& clientDefinition) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -33,7 +33,7 @@ HRESULT MidiNetworkClient::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -50,7 +50,7 @@ HRESULT MidiNetworkClient::ProcessIncomingPacket() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -67,7 +67,7 @@ HRESULT MidiNetworkClient::EstablishNewSession() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClientSession.cpp b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClientSession.cpp index fa55a1d17..786f59802 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClientSession.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkClientSession.cpp @@ -13,7 +13,7 @@ HRESULT MidiNetworkClientSession::Initialize() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -33,7 +33,7 @@ HRESULT MidiNetworkClientSession::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHost.cpp b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHost.cpp index 5426cb62a..9190af071 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHost.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHost.cpp @@ -17,7 +17,7 @@ MidiNetworkHost::Initialize( ) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -54,7 +54,7 @@ MidiNetworkHost::Start() if (status != winrt::Windows::Foundation::AsyncStatus::Completed) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_ERROR, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_ERROR), @@ -229,7 +229,7 @@ HRESULT MidiNetworkHost::ProcessIncomingPackets() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -254,7 +254,7 @@ HRESULT MidiNetworkHost::ProcessOutgoingPackets() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -281,7 +281,7 @@ HRESULT MidiNetworkHost::EstablishNewSession() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -301,7 +301,7 @@ HRESULT MidiNetworkHost::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHostSession.cpp b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHostSession.cpp index 5fc24b134..3d04de05a 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHostSession.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkHostSession.cpp @@ -12,7 +12,7 @@ HRESULT MidiNetworkHostSession::Initialize() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -58,7 +58,7 @@ HRESULT MidiNetworkHostSession::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkMessageProcessor.cpp b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkMessageProcessor.cpp index b3bc4d9d1..822d28ce7 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkMessageProcessor.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/MidiNetworkMessageProcessor.cpp @@ -14,7 +14,7 @@ HRESULT MidiNetworkMessageProcessor::Initialize(/* TODO: Callback functions as needed */) { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingPointer(this, "this"), @@ -31,7 +31,7 @@ HRESULT MidiNetworkMessageProcessor::SendUmpWithForwardErrorCorrection() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingPointer(this, "this"), @@ -48,7 +48,7 @@ HRESULT MidiNetworkMessageProcessor::Cleanup() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), @@ -65,7 +65,7 @@ HRESULT MidiNetworkMessageProcessor::ProcessIncomingPacket() { TraceLoggingWrite( - MidiNetworkMidiAbstractionTelemetryProvider::Provider(), + MidiNetworkMidiTransportTelemetryProvider::Provider(), MIDI_TRACE_EVENT_INFO, TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), TraceLoggingLevel(WINEVENT_LEVEL_INFO), diff --git a/src/api/Abstraction/UdpNetworkMidi2/Resource.h b/src/api/Abstraction/UdpNetworkMidi2/Resource.h index 92e916202..ef4412b31 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/Resource.h +++ b/src/api/Abstraction/UdpNetworkMidi2/Resource.h @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. #define IDS_PROJNAME 100 -#define IDR_MIDI2NETWORKMIDIABSTRACTION 101 +#define IDR_MIDI2NETWORKMIDITRANSPORT 101 #define IDS_PLUGIN_METADATA_VERSION 500 #define IDS_PLUGIN_METADATA_NAME 501 diff --git a/src/api/Abstraction/UdpNetworkMidi2/AbstractionState.cpp b/src/api/Abstraction/UdpNetworkMidi2/TransportState.cpp similarity index 75% rename from src/api/Abstraction/UdpNetworkMidi2/AbstractionState.cpp rename to src/api/Abstraction/UdpNetworkMidi2/TransportState.cpp index c1836f3f9..264f6d289 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/AbstractionState.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/TransportState.cpp @@ -9,14 +9,14 @@ #include "pch.h" -AbstractionState::AbstractionState() = default; -AbstractionState::~AbstractionState() = default; +TransportState::TransportState() = default; +TransportState::~TransportState() = default; -AbstractionState& AbstractionState::Current() +TransportState& TransportState::Current() { // explanation: http://www.modernescpp.com/index.php/thread-safe-initialization-of-data/ - static AbstractionState current; + static TransportState current; return current; } @@ -24,7 +24,7 @@ AbstractionState& AbstractionState::Current() HRESULT -AbstractionState::ConstructEndpointManager() +TransportState::ConstructEndpointManager() { RETURN_IF_FAILED(Microsoft::WRL::MakeAndInitialize(&m_endpointManager)); @@ -33,7 +33,7 @@ AbstractionState::ConstructEndpointManager() HRESULT -AbstractionState::ConstructConfigurationManager() +TransportState::ConstructConfigurationManager() { RETURN_IF_FAILED(Microsoft::WRL::MakeAndInitialize(&m_configurationManager)); diff --git a/src/api/Abstraction/UdpNetworkMidi2/AbstractionState.h b/src/api/Abstraction/UdpNetworkMidi2/TransportState.h similarity index 84% rename from src/api/Abstraction/UdpNetworkMidi2/AbstractionState.h rename to src/api/Abstraction/UdpNetworkMidi2/TransportState.h index f93c62cf4..74f9b99a4 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/AbstractionState.h +++ b/src/api/Abstraction/UdpNetworkMidi2/TransportState.h @@ -10,15 +10,15 @@ #pragma once // singleton -class AbstractionState +class TransportState { public: - static AbstractionState& Current(); + static TransportState& Current(); // no copying - AbstractionState(_In_ const AbstractionState&) = delete; - AbstractionState& operator=(_In_ const AbstractionState&) = delete; + TransportState(_In_ const TransportState&) = delete; + TransportState& operator=(_In_ const TransportState&) = delete; wil::com_ptr GetEndpointManager() @@ -51,8 +51,8 @@ class AbstractionState private: - AbstractionState(); - ~AbstractionState(); + TransportState(); + ~TransportState(); wil::com_ptr m_endpointManager; diff --git a/src/api/Abstraction/UdpNetworkMidi2/dllmain.cpp b/src/api/Abstraction/UdpNetworkMidi2/dllmain.cpp index d33de025d..30a8027aa 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/dllmain.cpp +++ b/src/api/Abstraction/UdpNetworkMidi2/dllmain.cpp @@ -2,7 +2,7 @@ #include "pch.h" -CMidi2NetworkMidiAbstractionModule _AtlModule; +CMidi2NetworkMidiTransportModule _AtlModule; extern "C" BOOL WINAPI DllMain( @@ -13,7 +13,7 @@ DllMain( { if (Reason == DLL_PROCESS_ATTACH) { - wil::SetResultTelemetryFallback(MidiNetworkMidiAbstractionTelemetryProvider::FallbackTelemetryCallback); + wil::SetResultTelemetryFallback(MidiNetworkMidiTransportTelemetryProvider::FallbackTelemetryCallback); } return _AtlModule.DllMain(Reason, Reserved); diff --git a/src/api/Abstraction/UdpNetworkMidi2/dllmain.h b/src/api/Abstraction/UdpNetworkMidi2/dllmain.h index 8e8daf927..a6da480af 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/dllmain.h +++ b/src/api/Abstraction/UdpNetworkMidi2/dllmain.h @@ -9,11 +9,11 @@ #pragma once -class CMidi2NetworkMidiAbstractionModule : public ATL::CAtlDllModuleT< CMidi2NetworkMidiAbstractionModule > +class CMidi2NetworkMidiTransportModule : public ATL::CAtlDllModuleT< CMidi2NetworkMidiTransportModule > { public : - DECLARE_LIBID(LIBID_Midi2NetworkMidiAbstractionLib) - DECLARE_REGISTRY_APPID_RESOURCEID(IDR_MIDI2NETWORKMIDIABSTRACTION, "{4568a471-6f32-4015-b4db-9087bfb60a0b}") + DECLARE_LIBID(LIBID_Midi2NetworkMidiTransportLib) + DECLARE_REGISTRY_APPID_RESOURCEID(IDR_MIDI2NETWORKMIDITRANSPORT, "{4568a471-6f32-4015-b4db-9087bfb60a0b}") }; -extern class CMidi2NetworkMidiAbstractionModule _AtlModule; +extern class CMidi2NetworkMidiTransportModule _AtlModule; diff --git a/src/api/Abstraction/UdpNetworkMidi2/pch.h b/src/api/Abstraction/UdpNetworkMidi2/pch.h index 738b0009a..752825431 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/pch.h +++ b/src/api/Abstraction/UdpNetworkMidi2/pch.h @@ -83,8 +83,8 @@ namespace internal = ::WindowsMidiServicesInternal; #include "MidiXProc.h" -#include "Midi2NetworkMidiAbstraction_i.c" -#include "Midi2NetworkMidiAbstraction.h" +#include "Midi2NetworkMidiTransport_i.c" +#include "Midi2NetworkMidiTransport.h" #include "dllmain.h" @@ -94,7 +94,7 @@ class MidiNetworkAdvertiser; class MidiNetworkHostSession; class MidiNetworkClientSession; -#include "abstraction_defs.h" +#include "transport_defs.h" #include "MidiNetworkEndpointDefinition.h" @@ -109,9 +109,9 @@ class MidiNetworkClientSession; #include "MidiNetworkAdvertiser.h" -#include "AbstractionState.h" +#include "TransportState.h" -#include "Midi2.NetworkMidiAbstraction.h" +#include "Midi2.NetworkMidiTransport.h" #include "Midi2.NetworkMidiBiDi.h" #include "Midi2.NetworkMidiEndpointManager.h" #include "Midi2.NetworkMidiConfigurationManager.h" diff --git a/src/api/Abstraction/UdpNetworkMidi2/abstraction_defs.h b/src/api/Abstraction/UdpNetworkMidi2/transport_defs.h similarity index 98% rename from src/api/Abstraction/UdpNetworkMidi2/abstraction_defs.h rename to src/api/Abstraction/UdpNetworkMidi2/transport_defs.h index 5c73dd042..0220fe3cf 100644 --- a/src/api/Abstraction/UdpNetworkMidi2/abstraction_defs.h +++ b/src/api/Abstraction/UdpNetworkMidi2/transport_defs.h @@ -11,7 +11,7 @@ // the IDs here aren't the full Ids, just the values we start with // The full Id comes back from the swdevicecreate callback -#define ABSTRACTION_LAYER_GUID __uuidof(Midi2NetworkMidiAbstraction); +#define TRANSPORT_LAYER_GUID __uuidof(Midi2NetworkMidiTransport); #define TRANSPORT_MANUFACTURER L"Microsoft" #define TRANSPORT_CODE L"UDP" diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayConfigurationManager.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayConfigurationManager.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayConfigurationManager.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayConfigurationManager.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayConfigurationManager.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayConfigurationManager.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayConfigurationManager.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayConfigurationManager.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayEndpointManager.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayEndpointManager.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayEndpointManager.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayEndpointManager.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayEndpointManager.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayEndpointManager.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayEndpointManager.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayEndpointManager.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayPluginMetadataProvider.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayPluginMetadataProvider.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayPluginMetadataProvider.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayPluginMetadataProvider.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayPluginMetadataProvider.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayPluginMetadataProvider.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayPluginMetadataProvider.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayPluginMetadataProvider.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingDestination.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingDestination.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingDestination.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingDestination.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingDestination.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingDestination.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingDestination.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingDestination.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingEntry.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingEntry.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingEntry.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingEntry.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingEntry.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingEntry.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingEntry.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingEntry.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingSource.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingSource.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingSource.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingSource.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingSource.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingSource.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayRoutingSource.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayRoutingSource.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.cpp b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.cpp rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.def b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.def similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.def rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.def diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.h b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.h rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.rc b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.rc similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.rc rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.rc diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.rgs b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.rgs similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.rgs rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.rgs diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.vcxproj b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.vcxproj similarity index 91% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.vcxproj rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.vcxproj index 0be4162b9..0dd31f940 100644 --- a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.vcxproj +++ b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.vcxproj @@ -1,325 +1,325 @@ - - - - - Debug - ARM64 - - - Debug - ARM64EC - - - Release - ARM64 - - - Debug - x64 - - - Release - ARM64EC - - - Release - x64 - - - - 17.0 - {7427BC7A-4247-42B0-AC9B-7DA10418AA9D} - Win32Proj - 10.0 - - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - Unicode - - - DynamicLibrary - false - v143 - Unicode - - - DynamicLibrary - false - v143 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)VSFiles\$(Platform)\$(Configuration)\ - $(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ - $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ - - - $(SolutionDir)VSFiles\$(Platform)\$(Configuration)\ - $(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ - $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ - - - $(SolutionDir)vsfiles\$(Platform)\$(Configuration)\ - $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ - $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ - - - $(SolutionDir)vsfiles\$(Platform)\$(Configuration)\ - $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ - $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ - - - $(SolutionDir)VSFiles\$(Platform)\$(Configuration)\ - $(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ - $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ - - - $(SolutionDir)vsfiles\$(Platform)\$(Configuration)\ - $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ - $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ - - - - Level4 - - - - - Level4 - - - - - Level4 - - - - - true - %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc - Create - pch.h - stdcpp20 - - - %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.VirtualPatchBayAbstraction.def - - - $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayAbstraction\$(Platform)\$(Configuration)\ - %(Filename).h - - - - - true - %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc - Create - pch.h - stdcpp20 - - - %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.VirtualPatchBayAbstraction.def - - - $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayAbstraction\$(Platform)\$(Configuration)\ - %(Filename).h - - - - - true - %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc - Create - pch.h - stdcpp20 - - - %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.VirtualPatchBayAbstraction.def - - - $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayAbstraction\$(Platform)\$(Configuration)\ - %(Filename).h - - - - - %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc - - - - - %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc - - - - - Level4 - - - - - Level4 - - - - - true - Create - pch.h - stdcpp20 - - - %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.VirtualPatchBayAbstraction.def - - - $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayAbstraction\$(Platform)\$(Configuration)\ - %(Filename).h - - - - - true - Create - pch.h - stdcpp20 - - - %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.VirtualPatchBayAbstraction.def - - - $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayAbstraction\$(Platform)\$(Configuration)\ - %(Filename).h - - - - - %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc - - - - - Level4 - - - - - true - Create - pch.h - stdcpp20 - - - %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); - Midi2.VirtualPatchBayAbstraction.def - - - $(SolutionDir)\idl;%(AdditionalIncludeDirectories) - $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayAbstraction\$(Platform)\$(Configuration)\ - %(Filename).h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + + + Debug + ARM64 + + + Debug + ARM64EC + + + Release + ARM64 + + + Debug + x64 + + + Release + ARM64EC + + + Release + x64 + + + + 17.0 + {7427BC7A-4247-42B0-AC9B-7DA10418AA9D} + Win32Proj + 10.0 + + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + false + v143 + Unicode + + + DynamicLibrary + false + v143 + Unicode + + + DynamicLibrary + false + v143 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)VSFiles\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ + + + $(SolutionDir)VSFiles\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ + + + $(SolutionDir)vsfiles\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ + + + $(SolutionDir)vsfiles\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ + + + $(SolutionDir)VSFiles\$(Platform)\$(Configuration)\ + $(SolutionDir)VSFiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ + + + $(SolutionDir)vsfiles\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(WindowsSdkDir)\Testing\Development\lib\$(Platform);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midikscommon\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiksenum\$(Platform)\$(Configuration);$(SolutionDir)\VSFiles\intermediate\midiks\$(Platform)\$(Configuration);$(SolutionDir)VSFiles\intermediate\AbstractionUtilities\$(Platform)\$(Configuration)\ + + + + Level4 + + + + + Level4 + + + + + Level4 + + + + + true + %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc + Create + pch.h + stdcpp20 + + + %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); + Midi2.VirtualPatchBayTransport.def + + + $(SolutionDir)\idl;%(AdditionalIncludeDirectories) + $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBay\$(Platform)\$(Configuration)\ + %(Filename).h + + + + + true + %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc + Create + pch.h + stdcpp20 + + + %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); + Midi2.VirtualPatchBayTransport.def + + + $(SolutionDir)\idl;%(AdditionalIncludeDirectories) + $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayTransport\$(Platform)\$(Configuration)\ + %(Filename).h + + + + + true + %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc + Create + pch.h + stdcpp20 + + + %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); + Midi2.VirtualPatchBayTransport.def + + + $(SolutionDir)\idl;%(AdditionalIncludeDirectories) + $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayTransport\$(Platform)\$(Configuration)\ + %(Filename).h + + + + + %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc + + + + + %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc + + + + + Level4 + + + + + Level4 + + + + + true + Create + pch.h + stdcpp20 + + + %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); + Midi2.VirtualPatchBayTransport.def + + + $(SolutionDir)\idl;%(AdditionalIncludeDirectories) + $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayTransport\$(Platform)\$(Configuration)\ + %(Filename).h + + + + + true + Create + pch.h + stdcpp20 + + + %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); + Midi2.VirtualPatchBayTransport.def + + + $(SolutionDir)\idl;%(AdditionalIncludeDirectories) + $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayTransport\$(Platform)\$(Configuration)\ + %(Filename).h + + + + + %(AdditionalIncludeDirectories);$(SolutionDir)inc;$(SolutionDir)VSFiles\intermediate\idl\$(Platform)\$(Configuration);$(IntDir);$(SolutionDir)Libs\AbstractionUtilities\inc + + + + + Level4 + + + + + true + Create + pch.h + stdcpp20 + + + %(AdditionalDependencies);onecoreuap.lib;avrt.lib;$(CoreLibraryDependencies); + Midi2.VirtualPatchBayTransport.def + + + $(SolutionDir)\idl;%(AdditionalIncludeDirectories) + $(SolutionDir)VSFiles\intermediate\midi2.VirtualPatchBayTransport\$(Platform)\$(Configuration)\ + %(Filename).h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.vcxproj.filters b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.vcxproj.filters similarity index 97% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.vcxproj.filters rename to src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.vcxproj.filters index a2c7a553d..17305ef28 100644 --- a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2.VirtualPatchBayAbstraction.vcxproj.filters +++ b/src/api/Abstraction/VirtualPatchbay/Midi2.VirtualPatchBayTransport.vcxproj.filters @@ -1,115 +1,115 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Resource Files - - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - - - Resource Files - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Resource Files + + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + + + Resource Files + + + + + Source Files + + \ No newline at end of file diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Midi2VirtualPatchBayAbstraction.idl b/src/api/Abstraction/VirtualPatchbay/Midi2VirtualPatchBayTransport.idl similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Midi2VirtualPatchBayAbstraction.idl rename to src/api/Abstraction/VirtualPatchbay/Midi2VirtualPatchBayTransport.idl diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/MidiPatchBayTable.cpp b/src/api/Abstraction/VirtualPatchbay/MidiPatchBayTable.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/MidiPatchBayTable.cpp rename to src/api/Abstraction/VirtualPatchbay/MidiPatchBayTable.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/MidiPatchBayTable.h b/src/api/Abstraction/VirtualPatchbay/MidiPatchBayTable.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/MidiPatchBayTable.h rename to src/api/Abstraction/VirtualPatchbay/MidiPatchBayTable.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/Resource.h b/src/api/Abstraction/VirtualPatchbay/Resource.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/Resource.h rename to src/api/Abstraction/VirtualPatchbay/Resource.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/AbstractionState.cpp b/src/api/Abstraction/VirtualPatchbay/TransportState.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/AbstractionState.cpp rename to src/api/Abstraction/VirtualPatchbay/TransportState.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/AbstractionState.h b/src/api/Abstraction/VirtualPatchbay/TransportState.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/AbstractionState.h rename to src/api/Abstraction/VirtualPatchbay/TransportState.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/dllmain.cpp b/src/api/Abstraction/VirtualPatchbay/dllmain.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/dllmain.cpp rename to src/api/Abstraction/VirtualPatchbay/dllmain.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/dllmain.h b/src/api/Abstraction/VirtualPatchbay/dllmain.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/dllmain.h rename to src/api/Abstraction/VirtualPatchbay/dllmain.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/packages.config b/src/api/Abstraction/VirtualPatchbay/packages.config similarity index 98% rename from src/api/Abstraction/VirtualPatchbayAbstraction/packages.config rename to src/api/Abstraction/VirtualPatchbay/packages.config index 74c170a0b..04b661f41 100644 --- a/src/api/Abstraction/VirtualPatchbayAbstraction/packages.config +++ b/src/api/Abstraction/VirtualPatchbay/packages.config @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/pch.cpp b/src/api/Abstraction/VirtualPatchbay/pch.cpp similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/pch.cpp rename to src/api/Abstraction/VirtualPatchbay/pch.cpp diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/pch.h b/src/api/Abstraction/VirtualPatchbay/pch.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/pch.h rename to src/api/Abstraction/VirtualPatchbay/pch.h diff --git a/src/api/Abstraction/VirtualPatchbayAbstraction/abstraction_defs.h b/src/api/Abstraction/VirtualPatchbay/transport_defs.h similarity index 100% rename from src/api/Abstraction/VirtualPatchbayAbstraction/abstraction_defs.h rename to src/api/Abstraction/VirtualPatchbay/transport_defs.h diff --git a/src/api/Midi2-InDevelopment.sln b/src/api/Midi2-InDevelopment.sln index 4874ffff5..c95b6e106 100644 --- a/src/api/Midi2-InDevelopment.sln +++ b/src/api/Midi2-InDevelopment.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.12.35209.166 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midi2.NetworkMidiAbstraction", "Abstraction\UdpNetworkMidi2\Midi2.NetworkMidiAbstraction.vcxproj", "{7E618284-6AA0-4FCE-9E4A-D895A5EE8E3C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midi2.NetworkMidiTransport", "Abstraction\UdpNetworkMidi2\Midi2.NetworkMidiTransport.vcxproj", "{7E618284-6AA0-4FCE-9E4A-D895A5EE8E3C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midi2.VirtualPatchBayAbstraction", "Abstraction\VirtualPatchbayAbstraction\Midi2.VirtualPatchBayAbstraction.vcxproj", "{7427BC7A-4247-42B0-AC9B-7DA10418AA9D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Midi2.VirtualPatchBayTransport", "Abstraction\VirtualPatchbay\Midi2.VirtualPatchBayTransport.vcxproj", "{7427BC7A-4247-42B0-AC9B-7DA10418AA9D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/api/Service/Exe/MidiEndpointProtocolWorker.cpp b/src/api/Service/Exe/MidiEndpointProtocolWorker.cpp index f77044527..f5e52ab58 100644 --- a/src/api/Service/Exe/MidiEndpointProtocolWorker.cpp +++ b/src/api/Service/Exe/MidiEndpointProtocolWorker.cpp @@ -395,6 +395,27 @@ CMidiEndpointProtocolWorker::Start( // add the function blocks now they are fully valid m_mostRecentResults.DiscoveredFunctionBlocks = m_discoveredFunctionBlocks.data(); m_mostRecentResults.CountFunctionBlocksReceived = (BYTE)m_discoveredFunctionBlocks.size(); + + // warning in case we get some inconsistent results + if (m_mostRecentResults.CountFunctionBlocksDeclared != m_mostRecentResults.CountFunctionBlocksReceived) + { + // We did not receive the correct number of function blocks. This is a failure + // condition. + + TraceLoggingWrite( + MidiSrvTelemetryProvider::Provider(), + MIDI_TRACE_EVENT_WARNING, + TraceLoggingString(__FUNCTION__, MIDI_TRACE_EVENT_LOCATION_FIELD), + TraceLoggingLevel(WINEVENT_LEVEL_WARNING), + TraceLoggingPointer(this, "this"), + TraceLoggingWideString(L"Incorrect function block count received", MIDI_TRACE_EVENT_MESSAGE_FIELD), + TraceLoggingWideString(m_deviceInterfaceId.c_str(), MIDI_TRACE_EVENT_DEVICE_SWD_ID_FIELD), + TraceLoggingUInt8(m_mostRecentResults.CountFunctionBlocksDeclared, "Declared FB Count"), + TraceLoggingUInt8(m_mostRecentResults.CountFunctionBlocksReceived, "Received FB Count") + ); + + m_mostRecentResults.AllEndpointInformationReceived = false; + } } else { @@ -410,6 +431,7 @@ CMidiEndpointProtocolWorker::Start( m_mostRecentResults.DiscoveredFunctionBlocks = nullptr; m_mostRecentResults.CountFunctionBlocksReceived = 0; + m_mostRecentResults.AllEndpointInformationReceived = false; } // Call callback diff --git a/src/dev-tools/midi-developer-tools.sln b/src/dev-tools/midi-developer-tools.sln new file mode 100644 index 000000000..55a860d7f --- /dev/null +++ b/src/dev-tools/midi-developer-tools.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35323.107 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "midiusbdescriptors", "midi-usb-descriptors\midiusbdescriptors.vcxproj", "{5EC6D5EB-53D4-4731-891E-F746F0201429}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Debug|ARM64EC = Debug|ARM64EC + Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|ARM64EC = Release|ARM64EC + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Debug|ARM64.Build.0 = Debug|ARM64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Debug|ARM64EC.Build.0 = Debug|ARM64EC + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Debug|x64.ActiveCfg = Debug|x64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Debug|x64.Build.0 = Debug|x64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Release|ARM64.ActiveCfg = Release|ARM64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Release|ARM64.Build.0 = Release|ARM64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Release|ARM64EC.Build.0 = Release|ARM64EC + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Release|x64.ActiveCfg = Release|x64 + {5EC6D5EB-53D4-4731-891E-F746F0201429}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {78DDEBBA-A5A7-4C73-8F9C-5E23806309F9} + EndGlobalSection +EndGlobal diff --git a/src/dev-tools/midi-usb-descriptors/UsbDevice.cpp b/src/dev-tools/midi-usb-descriptors/UsbDevice.cpp new file mode 100644 index 000000000..61973bcf0 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/UsbDevice.cpp @@ -0,0 +1,2 @@ +#include "pch.h" +#include "UsbDevice.h" diff --git a/src/dev-tools/midi-usb-descriptors/UsbDevice.h b/src/dev-tools/midi-usb-descriptors/UsbDevice.h new file mode 100644 index 000000000..e21cd0c28 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/UsbDevice.h @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + + +#pragma once + + + +class UsbDevice +{ + // string descriptors for later lookup + + + // interfaces + + + // errors + + +}; + diff --git a/src/dev-tools/midi-usb-descriptors/audio_descriptors.h b/src/dev-tools/midi-usb-descriptors/audio_descriptors.h new file mode 100644 index 000000000..fdc7ccd63 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/audio_descriptors.h @@ -0,0 +1,12 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + + +#pragma once diff --git a/src/dev-tools/midi-usb-descriptors/general_descriptors.h b/src/dev-tools/midi-usb-descriptors/general_descriptors.h new file mode 100644 index 000000000..55102a514 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/general_descriptors.h @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + + +#pragma once + + + + + diff --git a/src/dev-tools/midi-usb-descriptors/main.cpp b/src/dev-tools/midi-usb-descriptors/main.cpp new file mode 100644 index 000000000..e2b10c33a --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/main.cpp @@ -0,0 +1,136 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + +#include "pch.h" + + + +void OutputBlankLine() +{ + std::wcout + << std::endl; +} + +#define DESCRIPTOR_NAME_UNDERLINE_WIDTH 42 + +void OutputDescriptorName(_In_ std::wstring const& descriptorName, _In_ std::wstring annotation) +{ + // blank line + std::wcout << std::endl; + + // descriptor name + std::wcout + << descriptorName + << std::endl; + + // annotation if any + if (!annotation.empty()) + { + std::wcout + << L" <-- " + << annotation + << std::endl; + } + + std::wcout + << std::setw(DESCRIPTOR_NAME_UNDERLINE_WIDTH) + << std::left + << std::setfill('-') + << L"" + << std::endl; + +} + +#define DESCRIPTOR_FIELD_NAME_WIDTH 35 + +void OutputDescriptorFieldName(_In_ std::wstring const& fieldName) +{ + std::wstring label = fieldName + L":"; + + std::wcout + << std::setw(DESCRIPTOR_FIELD_NAME_WIDTH) + << std::left + << std::setfill(' ') + << label; +} + +void OutputHexField(_In_ std::wstring const& fieldName, _In_ uint16_t const value, _In_ uint8_t width, _In_ std::wstring const& annotation) +{ + OutputDescriptorFieldName(fieldName); + + // spacing to keep byte and word right align + std::wcout + << std::setw(max(0, 4 - width)) + << std::right + << std::setfill(' ') + << L""; + + std::wcout + << L"0x" + << std::hex + << std::setw(width) + << std::setfill('0') + << value; + + if (!annotation.empty()) + { + std::wcout + << L" <-- " + << annotation; + } + + std::wcout << std::endl; +} + +void OutputHexByteField(_In_ std::wstring const& fieldName, _In_ uint8_t const value, _In_ std::wstring const& annotation) +{ + OutputHexField(fieldName, value, 2, annotation); +} + +void OutputHexWordField(_In_ std::wstring const& fieldName, _In_ uint16_t const value, _In_ std::wstring const& annotation) +{ + OutputHexField(fieldName, value, 4, annotation); +} + + + +#define RETURN_SUCCESS return 0 +#define RETURN_FAIL return 1 + + + + +void BuildDescriptorTree(_In_ uint16_t vid, _In_ uint16_t pid) +{ + // find the device with the vid and pid, and store its parent hub and the port # it is in + + // Start reading descriptors. + + + + // If this has a MIDI 2.0 interface, request the group terminal blocks + + + +} + + +int __cdecl main() +{ + // TODO: Command-line parsing + + // command line parameter is vid and pid + + + + + RETURN_SUCCESS; +} + diff --git a/src/dev-tools/midi-usb-descriptors/midi_descriptors.h b/src/dev-tools/midi-usb-descriptors/midi_descriptors.h new file mode 100644 index 000000000..d694879ec --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/midi_descriptors.h @@ -0,0 +1,13 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + + +#pragma once + diff --git a/src/dev-tools/midi-usb-descriptors/midiusbdescriptors.vcxproj b/src/dev-tools/midi-usb-descriptors/midiusbdescriptors.vcxproj new file mode 100644 index 000000000..c34fabe26 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/midiusbdescriptors.vcxproj @@ -0,0 +1,206 @@ + + + + + true + true + true + true + 15.0 + {5ec6d5eb-53d4-4731-891e-f746f0201429} + Win32Proj + mididmp + 10.0 + 10.0.20348.0 + midiusbdescriptors + + + + + Debug + ARM64 + + + Debug + ARM64EC + + + Release + ARM64 + + + Debug + x64 + + + Release + ARM64EC + + + Release + x64 + + + + Application + v143 + v142 + v141 + v140 + Unicode + + + true + true + + + false + true + false + + + + + + + + + + + + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ + $(IncludePath) + $(LibraryPath) + + + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ + $(IncludePath) + $(LibraryPath) + + + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ + $(IncludePath) + $(LibraryPath) + + + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ + $(IncludePath) + $(LibraryPath) + + + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ + $(IncludePath) + $(LibraryPath) + + + $(SolutionDir)vsfiles\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)vsfiles\out\$(ProjectName)\$(Platform)\$(Configuration)\ + $(IncludePath) + $(LibraryPath) + + + + Use + pch.h + $(IntDir)pch.pch + _CONSOLE;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) + Level4 + %(AdditionalOptions) /permissive- /bigobj + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + stdcpp20 + stdcpp20 + stdcpp20 + %(AdditionalIncludeDirectories);$(SolutionDir)..\..\api\inc + %(AdditionalIncludeDirectories);$(SolutionDir)..\..\api\inc + %(AdditionalIncludeDirectories);$(SolutionDir)..\..\api\inc + + + Console + false + ntdll.lib;%(AdditionalDependencies);winmm.lib + ntdll.lib;%(AdditionalDependencies);winmm.lib + ntdll.lib;%(AdditionalDependencies);winmm.lib + + + + + WIN32;%(PreprocessorDefinitions) + stdcpp20 + + + ntdll.lib;%(AdditionalDependencies) + + + + + MaxSpeed + true + true + NDEBUG;%(PreprocessorDefinitions) + stdcpp20 + stdcpp20 + stdcpp20 + %(AdditionalIncludeDirectories);$(SolutionDir)..\..\api\inc + %(AdditionalIncludeDirectories);$(SolutionDir)..\..\api\inc + %(AdditionalIncludeDirectories);$(SolutionDir)..\..\api\inc + + + Console + true + true + false + ntdll.lib;%(AdditionalDependencies);winmm.lib + ntdll.lib;%(AdditionalDependencies);winmm.lib + ntdll.lib;%(AdditionalDependencies);winmm.lib + + + + + + + + + + + + + + Create + + + + + + + + + + + {0ca9273a-0bae-4ac4-8290-a72a985dd264} + + + {9eaa3af3-7328-4f67-a011-e2dd8fbaa4c4} + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/src/dev-tools/midi-usb-descriptors/midiusbdescriptors.vcxproj.filters b/src/dev-tools/midi-usb-descriptors/midiusbdescriptors.vcxproj.filters new file mode 100644 index 000000000..dcbc89e94 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/midiusbdescriptors.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {cedea5ff-a499-43f6-93db-e7fa71cb3c12} + + + + + Header Files + + + Header Files + + + Header Files\Descriptors + + + Header Files\Descriptors + + + Header Files\Descriptors + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + + + + \ No newline at end of file diff --git a/src/dev-tools/midi-usb-descriptors/midiusbdescriptors_field_defs.h b/src/dev-tools/midi-usb-descriptors/midiusbdescriptors_field_defs.h new file mode 100644 index 000000000..adc3c0267 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/midiusbdescriptors_field_defs.h @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + + +#pragma once + +// All field names here in case you want to parse the file. Just include or +// copy these definitions into your code + + diff --git a/src/dev-tools/midi-usb-descriptors/packages.config b/src/dev-tools/midi-usb-descriptors/packages.config new file mode 100644 index 000000000..7a9561b2b --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/dev-tools/midi-usb-descriptors/pch.cpp b/src/dev-tools/midi-usb-descriptors/pch.cpp new file mode 100644 index 000000000..164ab1192 --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/pch.cpp @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + +#include "pch.h" diff --git a/src/dev-tools/midi-usb-descriptors/pch.h b/src/dev-tools/midi-usb-descriptors/pch.h new file mode 100644 index 000000000..469abc2ae --- /dev/null +++ b/src/dev-tools/midi-usb-descriptors/pch.h @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License +// ============================================================================ +// This is part of the Windows MIDI Services App SDK and should be used +// in your Windows application via an official binary distribution. +// Further information: https://aka.ms/midi +// ============================================================================ +// Portions of this code adapted from the Windows UsbView Sample application +// Licenses and restrictions for that code apply + +#pragma once + +#include +#include + +#include + +//#pragma warning (disable: 4005) +//#include +//#pragma warning (pop) + + +#include +#include +#include + + +#include "combaseapi.h" +#include +#include + +#include "wstring_util.h" + +#include "midiusbdescriptors_field_defs.h" + +#include "general_descriptors.h" +#include "audio_descriptors.h" +#include "midi_descriptors.h" + +#include "UsbDevice.h"