Christian Costa : dmusic: Rename CreateSynthPortImpl to CreateSynthPortImpl and create stubs for CreateMidi{In|Out}PortImpl .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 51eb9331cf2b3f2a1d852b509469bca36ea14430
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=51eb9331cf2b3f2a1d852b5094...

Author: Christian Costa <titan.costa(a)gmail.com>
Date:   Tue Sep 18 23:13:32 2012 +0200

dmusic: Rename CreateSynthPortImpl to CreateSynthPortImpl and create stubs for CreateMidi{In|Out}PortImpl.

Init constructors in system ports list accordingly.

---

 dlls/dmusic/dmusic.c         |    8 ++++----
 dlls/dmusic/dmusic_private.h |    4 +++-
 dlls/dmusic/port.c           |   16 +++++++++++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 36e9516..b4b35ec 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -352,7 +352,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
 
     /* Fill midi mapper port info */
     port->device = MIDI_MAPPER;
-    port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */
+    port->create = DMUSIC_CreateMidiOutPortImpl;
     midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out));
     strcpyW(port->caps.wszDescription, caps_out.szPname);
     strcatW(port->caps.wszDescription, emulated);
@@ -364,7 +364,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
     for (i = 0; i < nb_midi_out; i++)
     {
         port->device = i;
-        port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */
+        port->create = DMUSIC_CreateMidiOutPortImpl;
         midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out));
         strcpyW(port->caps.wszDescription, caps_in.szPname);
         strcatW(port->caps.wszDescription, emulated);
@@ -377,7 +377,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
     for (i = 0; i < nb_midi_in; i++)
     {
         port->device = i;
-        port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */
+        port->create = DMUSIC_CreateMidiInPortImpl;
         midiInGetDevCapsW(i, &caps_in, sizeof(caps_in));
         strcpyW(port->caps.wszDescription, caps_in.szPname);
         strcatW(port->caps.wszDescription, emulated);
@@ -387,7 +387,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
     }
 
     /* Fill synth port info */
-    port->create = DMUSIC_CreateDirectMusicPortImpl; /* FIXME: The same for all ports for now */
+    port->create = DMUSIC_CreateSynthPortImpl;
     hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth);
     if (SUCCEEDED(hr))
     {
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index a1430ef..d8ff16e 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -169,7 +169,9 @@ struct IDirectMusicPortImpl {
 };
 
 /** Internal factory */
-extern HRESULT DMUSIC_CreateDirectMusicPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device) DECLSPEC_HIDDEN;
+extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN;
+extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN;
+extern HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN;
 
 /*****************************************************************************
  * IReferenceClockImpl implementation structure
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index 0626518..917a4ec 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -472,7 +472,7 @@ static const IDirectMusicThruVtbl DirectMusicThru_Vtbl = {
 	IDirectMusicThruImpl_ThruChannel
 };
 
-HRESULT DMUSIC_CreateDirectMusicPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device)
+HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps, DWORD device)
 {
 	IDirectMusicPortImpl *obj;
 	HRESULT hr = E_FAIL;
@@ -530,3 +530,17 @@ if(0)
 
 	return IDirectMusicPortImpl_QueryInterface ((LPDIRECTMUSICPORT)obj, lpcGUID, ppobj);
 }
+
+HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
+{
+    TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device);
+
+    return E_NOTIMPL;
+}
+
+HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
+{
+    TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device);
+
+    return E_NOTIMPL;
+}