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

Emmanuel Maillard : winecoreaudio: Implement MIDIOut_GetDevCaps and MIDIOut_GetNumDevs.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 0f7a3a32eeb377f5f41d2ecb5bd47c05ae71db3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7a3a32eeb377f5f41d2ecb5… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 00:58:26 2007 +0200 winecoreaudio: Implement MIDIOut_GetDevCaps and MIDIOut_GetNumDevs. --- dlls/winecoreaudio.drv/midi.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index af6c941..2e367b4 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -265,6 +265,29 @@ static DWORD MIDIOut_Close(WORD wDevID) return ret; } +static DWORD MIDIOut_GetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) +{ + TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); + + if (lpCaps == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + memcpy(lpCaps, &destinations[wDevID].caps, min(dwSize, sizeof(*lpCaps))); + return MMSYSERR_NOERROR; +} + +static DWORD MIDIOut_GetNumDevs(void) +{ + TRACE("\n"); + return MIDIOut_NumDevs; +} + /************************************************************************** * modMessage */ @@ -286,8 +309,13 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_LONGDATA: case MODM_PREPARE: case MODM_UNPREPARE: + TRACE("Unsupported message (08%x)\n", wMsg); + return MMSYSERR_NOTSUPPORTED; case MODM_GETDEVCAPS: + return MIDIOut_GetDevCaps(wDevID, (LPMIDIOUTCAPSW) dwParam1, dwParam2); case MODM_GETNUMDEVS: + return MIDIOut_GetNumDevs(); + case MODM_GETVOLUME: case MODM_SETVOLUME: case MODM_RESET:

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDI_NotifyClient, MIDIOut_Open and MIDIOut_Close.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 483c6953622145bb287e678459692c4da4bfbf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483c6953622145bb287e67845… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 00:57:18 2007 +0200 winecoreaudio: Implement MIDI_NotifyClient, MIDIOut_Open and MIDIOut_Close. --- dlls/winecoreaudio.drv/midi.c | 121 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 314dbe3..af6c941 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -146,6 +146,125 @@ LONG CoreAudio_MIDIRelease(void) return 1; } + +/************************************************************************** + * MIDI_NotifyClient [internal] + */ +static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +{ + DWORD dwCallBack; + UINT uFlags; + HANDLE hDev; + DWORD dwInstance; + + TRACE("wDevID=%d wMsg=%d dwParm1=%04X dwParam2=%04X\n", wDevID, wMsg, dwParam1, dwParam2); + + switch (wMsg) { + case MOM_OPEN: + case MOM_CLOSE: + case MOM_DONE: + case MOM_POSITIONCB: + dwCallBack = destinations[wDevID].midiDesc.dwCallback; + uFlags = destinations[wDevID].wFlags; + hDev = destinations[wDevID].midiDesc.hMidi; + dwInstance = destinations[wDevID].midiDesc.dwInstance; + break; + + case MIM_OPEN: + case MIM_CLOSE: + case MIM_DATA: + case MIM_LONGDATA: + case MIM_ERROR: + case MIM_LONGERROR: + case MIM_MOREDATA: + default: + WARN("Unsupported MSW-MIDI message %u\n", wMsg); + return MMSYSERR_ERROR; + } + + return DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2) ? + MMSYSERR_NOERROR : MMSYSERR_ERROR; +} + +static DWORD MIDIOut_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) +{ + MIDIDestination *dest; + + TRACE("wDevID=%d lpDesc=%p dwFlags=%08x\n", wDevID, lpDesc, dwFlags); + + if (lpDesc == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + if (destinations[wDevID].midiDesc.hMidi != 0) { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + + if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { + WARN("bad dwFlags\n"); + return MMSYSERR_INVALFLAG; + } + dest = &destinations[wDevID]; + + if (dest->caps.wTechnology == MOD_SYNTH) + { + if (!SynthUnit_CreateDefaultSynthUnit(&dest->graph, &dest->synth)) + { + ERR("SynthUnit_CreateDefaultSynthUnit dest=%p failed\n", dest); + return MMSYSERR_ERROR; + } + + if (!SynthUnit_Initialize(dest->synth, dest->graph)) + { + ERR("SynthUnit_Initialise dest=%p failed\n", dest); + return MMSYSERR_ERROR; + } + } + else + { + FIXME("MOD_MIDIPORT\n"); + } + dest->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + dest->midiDesc = *lpDesc; + + return MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); +} + +static DWORD MIDIOut_Close(WORD wDevID) +{ + DWORD ret = MMSYSERR_NOERROR; + + TRACE("wDevID=%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + 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; + + if (MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { + WARN("can't notify client !\n"); + ret = MMSYSERR_INVALPARAM; + } + destinations[wDevID].midiDesc.hMidi = 0; + + return ret; +} + /************************************************************************** * modMessage */ @@ -160,7 +279,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case DRVM_DISABLE: return 0; case MODM_OPEN: + return MIDIOut_Open(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MODM_CLOSE: + return MIDIOut_Close(wDevID); case MODM_DATA: case MODM_LONGDATA: case MODM_PREPARE:

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIOut_Data.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 8f03804b8bbf072debe8449b00bf18272637e0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f03804b8bbf072debe8449b0… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:06:32 2007 +0200 winecoreaudio: Implement MIDIOut_Data. --- dlls/winecoreaudio.drv/coremidi.h | 3 +++ dlls/winecoreaudio.drv/midi.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 38f1507..2a02003 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -52,6 +52,9 @@ extern OSStatus MIDIObjectGetProperties(MIDIObjectRef obj, CFPropertyListRef *ou typedef void *AudioUnit; typedef void *AUGraph; +extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame); +extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength); + #endif /* coremidi.c */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index ce959d1..250f523 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -265,6 +265,36 @@ static DWORD MIDIOut_Close(WORD wDevID) return ret; } +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); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + 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) + { + err = MusicDeviceMIDIEvent(destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0); + if (err != noErr) + { + ERR("MusicDeviceMIDIEvent(%p, %04x, %04x, %04x, %d) return %c%c%c%c\n", destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0, (char) (err >> 24), (char) (err >> 16), (char) (err >> 8), (char) err); + return MMSYSERR_ERROR; + } + } + else FIXME("MOD_MIDIPORT\n"); + + return MMSYSERR_NOERROR; +} /************************************************************************** * MIDIOut_Prepare [internal] @@ -358,6 +388,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_CLOSE: return MIDIOut_Close(wDevID); case MODM_DATA: + return MIDIOut_Data(wDevID, dwParam1); case MODM_LONGDATA: TRACE("Unsupported message (08%x)\n", wMsg); return MMSYSERR_NOTSUPPORTED; @@ -378,8 +409,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw return MMSYSERR_NOTSUPPORTED; } - - #else DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2)

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIOut_Prepare and MIDIOut_Unprepare.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: d250fc2b130d648cbaa935a50c04fb110ffd43aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d250fc2b130d648cbaa935a50… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 00:59:38 2007 +0200 winecoreaudio: Implement MIDIOut_Prepare and MIDIOut_Unprepare. --- dlls/winecoreaudio.drv/midi.c | 59 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 2e367b4..ce959d1 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -265,6 +265,58 @@ static DWORD MIDIOut_Close(WORD wDevID) return ret; } + +/************************************************************************** + * MIDIOut_Prepare [internal] + */ +static DWORD MIDIOut_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + /* MS doc says that dwFlags must be set to zero, but (kinda funny) MS mciseq drivers + * asks to prepare MIDIHDR which dwFlags != 0. + * So at least check for the inqueue flag + */ + if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || + lpMidiHdr->dwBufferLength >= 0x10000ul) { + WARN("%p %p %08x %lu/%d\n", lpMidiHdr, lpMidiHdr->lpData, + lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); + return MMSYSERR_INVALPARAM; + } + + lpMidiHdr->lpNext = 0; + lpMidiHdr->dwFlags |= MHDR_PREPARED; + lpMidiHdr->dwFlags &= ~MHDR_DONE; + return MMSYSERR_NOERROR; +} + +/************************************************************************** + * MIDIOut_Unprepare [internal] + */ +static DWORD MIDIOut_Unprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0) + return MMSYSERR_INVALPARAM; + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + lpMidiHdr->dwFlags &= ~MHDR_PREPARED; + + return MMSYSERR_NOERROR; +} + static DWORD MIDIOut_GetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) { TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); @@ -307,15 +359,16 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw return MIDIOut_Close(wDevID); case MODM_DATA: case MODM_LONGDATA: + TRACE("Unsupported message (08%x)\n", wMsg); + return MMSYSERR_NOTSUPPORTED; case MODM_PREPARE: + return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE: - TRACE("Unsupported message (08%x)\n", wMsg); - return MMSYSERR_NOTSUPPORTED; + return MIDIOut_Unprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return MIDIOut_GetDevCaps(wDevID, (LPMIDIOUTCAPSW) dwParam1, dwParam2); case MODM_GETNUMDEVS: return MIDIOut_GetNumDevs(); - case MODM_GETVOLUME: case MODM_SETVOLUME: case MODM_RESET:

1 0

Emmanuel Maillard : winecoreaudio: Initial MIDI support on Mac OS X.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 7ad29c8bb78a058e7e94c99b97695e2ae8e36e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad29c8bb78a058e7e94c99b9… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 00:55:33 2007 +0200 winecoreaudio: Initial MIDI support on Mac OS X. --- configure | 2 +- configure.ac | 2 +- dlls/winecoreaudio.drv/Makefile.in | 4 +- dlls/winecoreaudio.drv/audiounit.c | 114 +++++++++++++++ dlls/winecoreaudio.drv/coreaudio.c | 4 + dlls/winecoreaudio.drv/coreaudio.h | 3 +- dlls/winecoreaudio.drv/coremidi.c | 55 +++++++ dlls/winecoreaudio.drv/coremidi.h | 61 ++++++++ dlls/winecoreaudio.drv/midi.c | 189 +++++++++++++++++++++++++ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 + 10 files changed, 431 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ad29c8bb78a058e7e94c…

1 0

James Hawkins : msi: Implement special handling for the _Streams table.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: da55285acba1839fca9cf93422a42eac062760ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=da55285acba1839fca9cf9342… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Apr 25 05:22:01 2007 -0500 msi: Implement special handling for the _Streams table. --- dlls/msi/Makefile.in | 1 + dlls/msi/msipriv.h | 4 +- dlls/msi/query.h | 2 + dlls/msi/streams.c | 404 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/string.c | 8 +- dlls/msi/table.c | 15 ++- dlls/msi/tests/db.c | 61 +++----- 7 files changed, 447 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da55285acba1839fca9cf…

1 0

Rob Shearman : winebuild: Refer to strings used in generated stubs by symbol rather than by offset to avoid problems when the compiler aligns the strings by 2 or more bytes .
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 5fcc5d3f62396622020d3f29ee9ba4492dd04687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fcc5d3f62396622020d3f29e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 25 08:51:44 2007 +0100 winebuild: Refer to strings used in generated stubs by symbol rather than by offset to avoid problems when the compiler aligns the strings by 2 or more bytes. --- tools/winebuild/import.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 44c7802..da4b1db 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1177,14 +1177,14 @@ static void output_external_link_imports( DLLSPEC *spec ) void output_stubs( DLLSPEC *spec ) { const char *name, *exp_name; - int i, pos; + int i, count; if (!has_stubs( spec )) return; output( "\n/* stub functions */\n\n" ); output( "\t.text\n" ); - for (i = pos = 0; i < spec->nb_entry_points; i++) + for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; if (odp->type != TYPE_STUB) continue; @@ -1202,9 +1202,9 @@ void output_stubs( DLLSPEC *spec ) output( "1:" ); if (exp_name) { - output( "\tleal .L__wine_stub_strings+%d-1b(%%eax),%%ecx\n", pos ); + output( "\tleal .L%s_string-1b(%%eax),%%ecx\n", name ); output( "\tpushl %%ecx\n" ); - pos += strlen(exp_name) + 1; + count++; } else output( "\tpushl $%d\n", odp->ordinal ); @@ -1215,8 +1215,8 @@ void output_stubs( DLLSPEC *spec ) { if (exp_name) { - output( "\tpushl $.L__wine_stub_strings+%d\n", pos ); - pos += strlen(exp_name) + 1; + output( "\tpushl $.L%s_string\n", name ); + count++; } else output( "\tpushl $%d\n", odp->ordinal ); @@ -1226,17 +1226,20 @@ void output_stubs( DLLSPEC *spec ) output_function_size( name ); } - if (pos) + if (count) { output( "\t%s\n", get_asm_string_section() ); - output( ".L__wine_stub_strings:\n" ); for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; if (odp->type != TYPE_STUB) continue; exp_name = odp->name ? odp->name : odp->export_name; if (exp_name) + { + name = get_stub_name( odp, spec ); + output( ".L%s_string:\n", name ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), exp_name ); + } } } }

1 0

Rob Shearman : atl: Use the first entry in the object map in AtlInternalQueryInterface when IUnknown is requested .
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 3af74c5e5250b09bf453293214a3e3240e6a1140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af74c5e5250b09bf45329321… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 25 11:21:03 2007 +0100 atl: Use the first entry in the object map in AtlInternalQueryInterface when IUnknown is requested. --- dlls/atl/atl_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 69d62e7..a25f747 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -213,19 +213,19 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE { int i = 0; HRESULT rc = E_NOINTERFACE; - TRACE("(%p, %p, %p, %p)\n",this, pEntries, iid, ppvObject); + TRACE("(%p, %p, %s, %p)\n",this, pEntries, debugstr_guid(iid), ppvObject); if (IsEqualGUID(iid,&IID_IUnknown)) { TRACE("Returning IUnknown\n"); - *ppvObject = this; - IUnknown_AddRef((IUnknown*)this); + *ppvObject = ((LPSTR)this+pEntries[0].dw); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } while (pEntries[i].pFunc != 0) { - TRACE("Trying entry %i (%p %i %p)\n",i,pEntries[i].piid, + TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); if (pEntries[i].piid && IsEqualGUID(iid,pEntries[i].piid))

1 0

Rob Shearman : atl: AtlModuleGetClassObject should store an intermediate pointer in obj-> pCF and then query this for the requested interface.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 72ddcb5f362748c040dc902bb5c1c75760c675b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ddcb5f362748c040dc902bb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 25 11:21:48 2007 +0100 atl: AtlModuleGetClassObject should store an intermediate pointer in obj->pCF and then query this for the requested interface. Return CLASS_E_CLASSNOTAVAILABLE instead of E_FAIL. --- dlls/atl/atl_main.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index a25f747..3b5703e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -340,6 +340,7 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i; + HRESULT hres = CLASS_E_CLASSNOTAVAILABLE; TRACE("%p %s %s %p\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -354,13 +355,21 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid, TRACE("found object %i\n", i); if (obj->pfnGetClassObject) - return obj->pfnGetClassObject(obj->pfnCreateInstance, riid, ppv); + { + if (!obj->pCF) + hres = obj->pfnGetClassObject(obj->pfnCreateInstance, + &IID_IUnknown, + (void **)&obj->pCF); + if (obj->pCF) + hres = IUnknown_QueryInterface(obj->pCF, riid, ppv); + break; + } } } WARN("no class object found for %s\n", debugstr_guid(rclsid)); - return E_FAIL; + return hres; } /***********************************************************************

1 0

Paul Vriens : ws2_32/tests: Add required parameter to CreateThread ( for Win9x and WinME).
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: f570fd314c864d085672f836f386fdfe067d598a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f570fd314c864d085672f836f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 11:53:39 2007 +0200 ws2_32/tests: Add required parameter to CreateThread (for Win9x and WinME). --- dlls/ws2_32/tests/sock.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17268b7..da0dda9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1356,6 +1356,7 @@ static void test_select(void) struct timeval select_timeout; select_thread_params thread_params; HANDLE thread_handle; + DWORD id; fdRead = socket(AF_INET, SOCK_STREAM, 0); ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); @@ -1395,7 +1396,7 @@ static void test_select(void) thread_params.s = fdRead; thread_params.ReadKilled = FALSE; server_ready = CreateEventW(NULL, TRUE, FALSE, NULL); - thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, NULL ); + thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, &id ); ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); WaitForSingleObject (server_ready, INFINITE); @@ -1429,6 +1430,7 @@ static void test_accept(void) struct sockaddr_in address; select_thread_params thread_params; HANDLE thread_handle = NULL; + DWORD id; server_socket = socket(AF_INET, SOCK_STREAM, 0); if (server_socket == INVALID_SOCKET) @@ -1463,7 +1465,7 @@ static void test_accept(void) thread_params.s = server_socket; thread_params.ReadKilled = FALSE; thread_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) AcceptKillThread, - &thread_params, 0, NULL); + &thread_params, 0, &id); if (thread_handle == NULL) { trace("error creating thread: %d\n", GetLastError()); @@ -1641,6 +1643,7 @@ static void test_send(void) const int buflen = 1024*1024; char *buffer = NULL; int ret; + DWORD id; src = socket(AF_INET, SOCK_STREAM, 0); if (src == INVALID_SOCKET) @@ -1696,7 +1699,7 @@ static void test_send(void) goto end; } - hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, NULL); + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); if (hThread == NULL) { ok(0, "CreateThread failed, error %d\n", GetLastError()); @@ -1739,6 +1742,7 @@ static void test_write_events(void) int len; u_long one = 1; int ret; + DWORD id; src = socket(AF_INET, SOCK_STREAM, 0); if (src == INVALID_SOCKET) @@ -1794,7 +1798,7 @@ static void test_write_events(void) goto end; } - hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, NULL); + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); if (hThread == NULL) { ok(0, "CreateThread failed, error %d\n", GetLastError());

1 0