May 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : ddraw: Store a WineD3DBaseTexture instead of a WineD3DTexture.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 7ca369d9b6aefa53bfb611cdcd5d18327ac4ad2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca369d9b6aefa53bfb611cdc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 02:04:11 2007 +0200 ddraw: Store a WineD3DBaseTexture instead of a WineD3DTexture. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17adb27..9f641e1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2406,7 +2406,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, 0, /* usage */ Format, Pool, - &object->wineD3DTexture, + (IWineD3DTexture **) &object->wineD3DTexture, 0, /* SharedHandle */ (IUnknown *) ICOM_INTERFACE(object, IDirectDrawSurface7), D3D7CB_CreateSurface ); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 85e15bc..b2fc8b3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -227,7 +227,7 @@ struct IDirectDrawSurfaceImpl /* Connections to other Objects */ IDirectDrawImpl *ddraw; IWineD3DSurface *WineD3DSurface; - IWineD3DTexture *wineD3DTexture; + IWineD3DBaseTexture *wineD3DTexture; /* This implementation handles attaching surfaces to other surfaces */ IDirectDrawSurfaceImpl *next_attached; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d26c39d..61be064 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2295,7 +2295,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *) This->Handles[Value - 1].ptr; return IWineD3DDevice_SetTexture(This->wineD3DDevice, 0, - (IWineD3DBaseTexture *) surf->wineD3DTexture); + surf->wineD3DTexture); } } @@ -3946,7 +3946,7 @@ IDirect3DDeviceImpl_7_SetTexture(IDirect3DDevice7 *iface, /* Texture may be NULL here */ return IWineD3DDevice_SetTexture(This->wineD3DDevice, Stage, - surf ? (IWineD3DBaseTexture * ) surf->wineD3DTexture : NULL); + surf ? surf->wineD3DTexture : NULL); } static HRESULT WINAPI diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ea09f85..96aec40 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -301,7 +301,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) */ if(This->wineD3DTexture) { - IWineD3DTexture_Release(This->wineD3DTexture); + IWineD3DBaseTexture_Release(This->wineD3DTexture); } /* If it's the RenderTarget, destroy the d3ddevice */ else if( (ddraw->d3d_initialized) && (This == ddraw->d3d_target)) @@ -1815,8 +1815,8 @@ IDirectDrawSurfaceImpl_SetLOD(IDirectDrawSurface7 *iface, return DDERR_INVALIDOBJECT; } - return IWineD3DTexture_SetLOD(This->wineD3DTexture, - MaxLOD); + return IWineD3DBaseTexture_SetLOD(This->wineD3DTexture, + MaxLOD); } /***************************************************************************** @@ -1846,7 +1846,7 @@ IDirectDrawSurfaceImpl_GetLOD(IDirectDrawSurface7 *iface, if (!(This->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) return DDERR_INVALIDOBJECT; - *MaxLOD = IWineD3DTexture_GetLOD(This->wineD3DTexture); + *MaxLOD = IWineD3DBaseTexture_GetLOD(This->wineD3DTexture); return DD_OK; }

1 0

Emmanuel Maillard : winecoreaudio.drv: MIDIIn_MessageHandler: Remove a TRACE and simplify skipping SysEx.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 41b8a570dc14c42238897cd97c0b312838d0efd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b8a570dc14c42238897cd97… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Mon Apr 30 14:34:23 2007 +0200 winecoreaudio.drv: MIDIIn_MessageHandler: Remove a TRACE and simplify skipping SysEx. --- dlls/winecoreaudio.drv/midi.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index f10f5f0..ba6c40e 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -845,7 +845,6 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD MIDISource *src = NULL; DWORD sendData = 0; - TRACE("\n"); switch (msgid) { case 0: @@ -866,15 +865,6 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD { FIXME("Starting System Exclusive\n"); src->state |= 2; - for (i = 0; i < msg->length; ++i) - { - if (msg->data[i] == 0xF7) - { - FIXME("Ending System Exclusive\n"); - src->state &= ~2; - } - } - goto done; } if (src->state & 2) {

1 0

Emmanuel Maillard : winecoreaudio.drv: Create only one MIDIOutPort and one MIDIInPort for all destinations and sources .
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: dea9878c2d8da55019d27cba0fc614f2af069d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea9878c2d8da55019d27cba0… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Mon Apr 30 14:37:33 2007 +0200 winecoreaudio.drv: Create only one MIDIOutPort and one MIDIInPort for all destinations and sources. --- dlls/winecoreaudio.drv/coremidi.c | 2 +- dlls/winecoreaudio.drv/midi.c | 38 +++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 6c47c87..282d958 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -63,7 +63,7 @@ void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefC MIDIPacket *packet = (MIDIPacket *)pktlist->packet; for (i = 0; i < pktlist->numPackets; ++i) { - msg.devID = *((UInt16 *)refCon); + msg.devID = *((UInt16 *)connRefCon); msg.length = packet->length; memcpy(msg.data, packet->data, sizeof(packet->data)); diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index ba6c40e..c8bec5c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -59,14 +59,16 @@ typedef struct tagMIDIDestination { AUGraph graph; AudioUnit synth; - MIDIPortRef port; + MIDIEndpointRef dest; + MIDIOUTCAPSW caps; MIDIOPENDESC midiDesc; WORD wFlags; } MIDIDestination; typedef struct tagMIDISource { - MIDIPortRef port; + MIDIEndpointRef source; + WORD wDevID; int state; /* 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ MIDIINCAPSW caps; @@ -81,6 +83,9 @@ static CFStringRef MIDIInThreadPortName = NULL; static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); +static MIDIPortRef MIDIInPort = NULL; +static MIDIPortRef MIDIOutPort = NULL; + #define MAX_MIDI_SYNTHS 1 MIDIDestination *destinations; @@ -123,23 +128,28 @@ LONG CoreAudio_MIDIInit(void) InitializeCriticalSection(&midiInLock); MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL); + + name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WineInputPort.%u"), getpid()); + MIDIInputPortCreate(wineMIDIClient, name, MIDIIn_ReadProc, NULL, &MIDIInPort); + CFRelease(name); + } + if (numDest > 0) + { + name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WineOutputPort.%u"), getpid()); + MIDIOutputPortCreate(wineMIDIClient, name, &MIDIOutPort); + CFRelease(name); } /* initialize sources */ for (i = 0; i < MIDIIn_NumDevs; i++) { - MIDIEndpointRef endpoint = MIDIGetSource(i); - sources[i].wDevID = i; + sources[i].source = MIDIGetSource(i); - CoreMIDI_GetObjectName(endpoint, szPname, sizeof(szPname)); + CoreMIDI_GetObjectName(sources[i].source, szPname, sizeof(szPname)); MultiByteToWideChar(CP_ACP, 0, szPname, -1, sources[i].caps.szPname, sizeof(sources[i].caps.szPname)/sizeof(WCHAR)); - name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WineInputPort.%d.%u"), i, getpid()); - MIDIInputPortCreate(wineMIDIClient, name, MIDIIn_ReadProc, &sources[i].wDevID, &sources[i].port); - CFRelease(name); - - MIDIPortConnectSource(sources[i].port, endpoint, NULL); + MIDIPortConnectSource(MIDIInPort, sources[i].source, &sources[i].wDevID); sources[i].state = 0; /* FIXME */ @@ -168,15 +178,11 @@ LONG CoreAudio_MIDIInit(void) /* initialise available destinations */ for (i = MAX_MIDI_SYNTHS; i < numDest + MAX_MIDI_SYNTHS; i++) { - MIDIEndpointRef endpoint = MIDIGetDestination(i - MAX_MIDI_SYNTHS); + destinations[i].dest = MIDIGetDestination(i - MAX_MIDI_SYNTHS); - CoreMIDI_GetObjectName(endpoint, szPname, sizeof(szPname)); + CoreMIDI_GetObjectName(destinations[i].dest, szPname, sizeof(szPname)); MultiByteToWideChar(CP_ACP, 0, szPname, -1, destinations[i].caps.szPname, sizeof(destinations[i].caps.szPname)/sizeof(WCHAR)); - name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WineOutputPort.%d.%u"), i, getpid()); - MIDIOutputPortCreate(wineMIDIClient, name, &destinations[i].port); - CFRelease(name); - destinations[i].caps.wTechnology = MOD_MIDIPORT; destinations[i].caps.wChannelMask = 0xFFFF;

1 0

Emmanuel Maillard : winecoreaudio.drv: Implement MIDIOut_Data when device is a MOD_MIDIPORT.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 622ee1c4cc3b040c023d1ca9fe97aa6714fc920e URL: http://source.winehq.org/git/wine.git/?a=commit;h=622ee1c4cc3b040c023d1ca9f… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Mon Apr 30 14:39:44 2007 +0200 winecoreaudio.drv: Implement MIDIOut_Data when device is a MOD_MIDIPORT. Implement MIDIOut_Send. --- dlls/winecoreaudio.drv/coremidi.c | 13 +++++++++++++ dlls/winecoreaudio.drv/coremidi.h | 2 ++ dlls/winecoreaudio.drv/midi.c | 25 +++++++++++++------------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 282d958..abe8454 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); #ifdef HAVE_COREAUDIO_COREAUDIO_H #include <CoreMIDI/CoreMIDI.h> +#include <mach/mach_time.h> #include "coremidi.h" @@ -72,4 +73,16 @@ void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefC packet = MIDIPacketNext(packet); } } + +void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length) +{ + Byte packetBuff[512]; + MIDIPacketList *packetList = (MIDIPacketList *)packetBuff; + + MIDIPacket *packet = MIDIPacketListInit(packetList); + + packet = MIDIPacketListAdd(packetList, sizeof(packetBuff), packet, mach_absolute_time(), length, buffer); + if (packet) + MIDISend(port, dest, packetList); +} #endif /* HAVE_COREAUDIO_COREAUDIO_H */ diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 405f999..c93edc6 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -76,6 +76,8 @@ extern MIDIClientRef CoreMIDI_CreateClient(CFStringRef name); extern void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size); extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon); +extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); + /* midi.c */ void MIDIIn_SendMessage(MIDIMessage msg); diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index c8bec5c..d5d82b7 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -303,10 +303,6 @@ static DWORD MIDIOut_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ERROR; } } - else - { - FIXME("MOD_MIDIPORT\n"); - } dest->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); dest->midiDesc = *lpDesc; @@ -326,8 +322,6 @@ static DWORD MIDIOut_Close(WORD wDevID) if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) SynthUnit_Close(destinations[wDevID].graph); - else - FIXME("MOD_MIDIPORT\n"); destinations[wDevID].graph = 0; destinations[wDevID].synth = 0; @@ -344,10 +338,7 @@ static DWORD MIDIOut_Close(WORD wDevID) static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) { WORD evt = LOBYTE(LOWORD(dwParam)); - WORD d1 = HIBYTE(LOWORD(dwParam)); - WORD d2 = LOBYTE(HIWORD(dwParam)); UInt8 chn = (evt & 0x0F); - OSStatus err = noErr; TRACE("wDevID=%d dwParam=%08X\n", wDevID, dwParam); @@ -356,10 +347,12 @@ static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) return MMSYSERR_BADDEVICEID; } - TRACE("evt=%08x d1=%04x d2=%04x (evt & 0xF0)=%04x chn=%d\n", evt, d1, d2, (evt & 0xF0), chn); - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) { + WORD d1 = HIBYTE(LOWORD(dwParam)); + WORD d2 = LOBYTE(HIWORD(dwParam)); + OSStatus err = noErr; + err = MusicDeviceMIDIEvent(destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0); if (err != noErr) { @@ -367,7 +360,15 @@ static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) return MMSYSERR_ERROR; } } - else FIXME("MOD_MIDIPORT\n"); + else + { + UInt8 buffer[3]; + buffer[0] = (evt & 0xF0) | chn; + buffer[1] = HIBYTE(LOWORD(dwParam)); + buffer[2] = LOBYTE(HIWORD(dwParam)); + + MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, buffer, 3); + } return MMSYSERR_NOERROR; }

1 0

lostwages/ news/2007043001.xml wwn/wn20070430_ ...
by WineHQ 01 May '07

01 May '07

ChangeSet ID: 31119 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/04/30 22:04:32 Added files: news : 2007043001.xml wwn : wn20070430_330.xml Log message: WWN #330 Patch: http://cvs.winehq.org/patch.py?id=31119 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007043001.xml Added 1.1 +0 -0 lostwages/wwn/wn20070430_330.xml

1 0