winmidi: make com extensions work in header-only mode

Author: jcelerier

cmake/libremidi.winmidi.cmake

@@ -78,7 +78,3 @@ target_include_directories(libremidi SYSTEM ${_public}
 )
 target_compile_definitions(libremidi ${_public} LIBREMIDI_WINMIDI)
 target_link_libraries(libremidi ${_public} RuntimeObject windowsapp)
-target_sources(libremidi PRIVATE
-  "${CMAKE_BINARY_DIR}/cppwinrt-winmidi/WindowsMidiServicesAppSdkComExtensions_i.c"
-  "${CMAKE_BINARY_DIR}/cppwinrt-winmidi/WindowsMidiServicesAppSdkComExtensions_p.c"
-)

include/libremidi/backends/winmidi/helpers.hpp

@@ -19,6 +19,14 @@
 #if __has_include(<WindowsMidiServicesAppSdkComExtensions.h>)
 #include <WindowsMidiServicesAppSdkComExtensions.h>
   #define LIBREMIDI_WINMIDI_HAS_COM_EXTENSIONS 1
+
+#define LIBREMIDI_DEFINE_GUID_CONSTEXPR(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        static constexpr const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+namespace libremidi {
+  LIBREMIDI_DEFINE_GUID_CONSTEXPR(IID, IID_IMidiEndpointConnectionMessagesReceivedCallback,0x8087b303,0x0519,0x31d1,0x31,0xd1,0x00,0x00,0x00,0x00,0x00,0x10);
+  LIBREMIDI_DEFINE_GUID_CONSTEXPR(IID, IID_IMidiEndpointConnectionRaw,0x8087b303,0x0519,0x31d1,0x31,0xd1,0x00,0x00,0x00,0x00,0x00,0x20);
+}
 #endif
 
 // MinGW support

include/libremidi/backends/winmidi/midi_in.hpp

@@ -35,7 +35,7 @@ class midi_in_impl final
         return E_POINTER;
 
       if (riid == __uuidof(IUnknown) ||
-          riid == IID_IMidiEndpointConnectionMessagesReceivedCallback)
+          riid == libremidi::IID_IMidiEndpointConnectionMessagesReceivedCallback)
       {
         *ppvObject = static_cast<IMidiEndpointConnectionMessagesReceivedCallback*>(this);
         AddRef();
@@ -113,7 +113,7 @@ class midi_in_impl final
       process_message(args);
     });
 #else
-    m_endpoint.as(IID_IMidiEndpointConnectionRaw, m_raw_endpoint.put_void());
+    m_endpoint.as(libremidi::IID_IMidiEndpointConnectionRaw, m_raw_endpoint.put_void());
 
     m_raw_endpoint->SetMessagesReceivedCallback(
         &raw_callback

include/libremidi/backends/winmidi/midi_out.hpp

@@ -48,7 +48,7 @@ class midi_out_impl final
 
     m_endpoint = m_session.CreateEndpointConnection(ep.EndpointDeviceId());
 #if LIBREMIDI_WINMIDI_HAS_COM_EXTENSIONS
-    m_endpoint.as(IID_IMidiEndpointConnectionRaw, m_raw_endpoint.put_void());
+    m_endpoint.as(libremidi::IID_IMidiEndpointConnectionRaw, m_raw_endpoint.put_void());
   #endif
     m_endpoint.Open();
 

include/libremidi/cmidi2.hpp

@@ -6,8 +6,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#if !defined(_MSC_VER)
 #pragma GCC system_header
 #pragma clang system_header
+#endif
 
 #define CMIDI2_MIDI_2_0_RESERVED 0
 #define CMIDI2_JR_TIMESTAMP_TICKS_PER_SECOND 31250

include/libremidi/error.hpp

@@ -1,11 +1,15 @@
 #pragma once
 #include <libremidi/config.hpp>
 
+#if !defined(_MSC_VER)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
 #include <libremidi/system_error2.hpp>
+#if !defined(_MSC_VER)
 #pragma GCC diagnostic pop
+#endif
 
 #include <functional>
 #include <string_view>