March 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Escape value for attribute in put_value().
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: c9563be542a8bbdb918efcbb4270ba0fe54c854b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9563be542a8bbdb918efcbb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:09:25 2013 +0400 msxml3: Escape value for attribute in put_value(). --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index d461ce1..9ab3035 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -603,7 +603,7 @@ static HRESULT WINAPI domattr_put_value( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); - return node_put_value(&This->node, &value); + return node_put_value_escaped(&This->node, &value); } static const struct IXMLDOMAttributeVtbl domattr_vtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2ff78c2..c1bfc1a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8046,10 +8046,15 @@ static void test_put_nodeTypedValue(void) static void test_get_xml(void) { static const char xmlA[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<a>test</a>\r\n"; + static const char attrA[] = "attr=\""a & b"\""; + static const char attr2A[] = "\"a & b\""; + static const char attr3A[] = "attr=\"&quot;a\""; + static const char attr4A[] = ""a"; static const char fooA[] = "<foo/>"; IXMLDOMProcessingInstruction *pi; IXMLDOMNode *first; IXMLDOMElement *elem = NULL; + IXMLDOMAttribute *attr; IXMLDOMDocument *doc; VARIANT_BOOL b; VARIANT v; @@ -8105,6 +8110,51 @@ static void test_get_xml(void) SysFreeString(xml); IXMLDOMElement_Release(elem); + + /* attribute node */ + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("\"a & b\""); + hr = IXMLDOMAttribute_put_value(attr, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + xml = NULL; + hr = IXMLDOMAttribute_get_xml(attr, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(xml, _bstr_(attrA), (sizeof(attrA)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + VariantInit(&v); + hr = IXMLDOMAttribute_get_value(attr, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + ok(!memcmp(V_BSTR(&v), _bstr_(attr2A), (sizeof(attr2A)-1)*sizeof(WCHAR)), + "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_(""a"); + hr = IXMLDOMAttribute_put_value(attr, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + xml = NULL; + hr = IXMLDOMAttribute_get_xml(attr, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(xml, _bstr_(attr3A), (sizeof(attr3A)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + VariantInit(&v); + hr = IXMLDOMAttribute_get_value(attr, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + ok(!memcmp(V_BSTR(&v), _bstr_(attr4A), (sizeof(attr4A)-1)*sizeof(WCHAR)), + "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Jörg Höhle : wineoss: Add midi MTC Quarter Frame support (on output).
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 702fe6738b1091eb6f58735ed75e8c67d58f76f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702fe6738b1091eb6f58735ed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 26 11:18:36 2013 +0100 wineoss: Add midi MTC Quarter Frame support (on output). --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 11b7c91..2b3d433 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1445,7 +1445,6 @@ static DWORD modData(WORD wDevID, DWORD dwParam) switch (evt & 0x0F) { case 0x00: /* System Exclusive, don't do it on modData, * should require modLongData*/ - case 0x01: /* Undefined */ case 0x04: /* Undefined. */ case 0x05: /* Undefined. */ case 0x07: /* End of Exclusive. */ @@ -1470,6 +1469,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) SEQ_MIDIOUT(dev, 0x01); SEQ_MIDIOUT(dev, 0xf7); break; + case 0x01: /* MTC Quarter frame */ case 0x03: /* Song Select. */ SEQ_MIDIOUT(dev, evt); SEQ_MIDIOUT(dev, d1);

1 0

Jörg Höhle : winealsa: Reword some MIDI log messages.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 2bc23b0c55fc50a468959c8bc4334a2e15d1a98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc23b0c55fc50a468959c8bc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 19 20:43:09 2013 +0100 winealsa: Reword some MIDI log messages. --- dlls/winealsa.drv/midi.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ee975e3..11b0f30 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -118,9 +118,6 @@ static HANDLE hThread; * Low level MIDI implementation * *======================================================================*/ -static int midiOpenSeq(int); -static int midiCloseSeq(void); - #if 0 /* Debug Purpose */ static void error_handler(const char* file, int line, const char* function, int err, const char* fmt, ...) { @@ -246,21 +243,21 @@ static int midiOpenSeq(int create_client) if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); #else port_out = snd_seq_create_simple_port(midiSeq, "WINE ALSA Output", SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); if (port_out < 0) TRACE("Unable to create output port\n"); else - TRACE("Outport port created successfully (%d)\n", port_out); + TRACE("Outport port %d created successfully\n", port_out); port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", SND_SEQ_PORT_CAP_WRITE, SND_SEQ_PORT_TYPE_APPLICATION); if (port_in < 0) TRACE("Unable to create input port\n"); else - TRACE("Input port created successfully (%d)\n", port_in); + TRACE("Input port %d created successfully\n", port_in); #endif } } @@ -413,7 +410,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) break; } if (toSend != 0) { - TRACE("Sending event %08x (from %d %d)\n", toSend, ev->source.client, ev->source.port); + TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); } } @@ -485,7 +482,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; - TRACE("input port connected %d %d %d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); + TRACE("Input port :%d connected %d:%d\n",port_in,MidiInDev[wDevID].addr.client,MidiInDev[wDevID].addr.port); if (numStartedMidiIn++ == 0) { end_thread = 0; @@ -761,8 +758,9 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; + TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); return MMSYSERR_NOERROR; } @@ -999,7 +997,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); + TRACE("destination %d:%d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); snd_seq_event_output_direct(midiSeq, &event); HeapFree(GetProcessHeap(), 0, lpNewData);

1 0

Nikolay Sivov : msxml3: Avoid unneeded variant copy in setAttribute(), leak fixed as a side effect.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: 2907ad98c03090377a810346bececf1cd992f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2907ad98c03090377a810346b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 09:08:33 2013 +0400 msxml3: Avoid unneeded variant copy in setAttribute(), leak fixed as a side effect. --- dlls/msxml3/element.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4892920..929830b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1228,7 +1228,6 @@ static HRESULT WINAPI domelem_setAttribute( xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; HRESULT hr; - VARIANT var; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value)); @@ -1236,16 +1235,25 @@ static HRESULT WINAPI domelem_setAttribute( if ( !element ) return E_FAIL; - VariantInit(&var); - hr = VariantChangeType(&var, &value, 0, VT_BSTR); - if(hr != S_OK) + if (V_VT(&value) != VT_BSTR) { - FIXME("VariantChangeType failed\n"); - return hr; + VARIANT var; + + VariantInit(&var); + hr = VariantChangeType(&var, &value, 0, VT_BSTR); + if (hr != S_OK) + { + FIXME("VariantChangeType failed\n"); + return hr; + } + + xml_value = xmlchar_from_wchar(V_BSTR(&var)); + VariantClear(&var); } + else + xml_value = xmlchar_from_wchar(V_BSTR(&value)); xml_name = xmlchar_from_wchar( name ); - xml_value = xmlchar_from_wchar( V_BSTR(&var) ); if ((local = xmlSplitQName2(xml_name, &prefix))) { @@ -1268,7 +1276,6 @@ static HRESULT WINAPI domelem_setAttribute( heap_free(xml_value); heap_free(xml_name); - VariantClear(&var); return hr; }

1 0

Nikolay Sivov : msxml3: Remove unneeded cast to xmlDocPtr.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: a935a44b441a586e4a8044fa5ad423b532349415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a935a44b441a586e4a8044fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 28 22:44:02 2013 +0400 msxml3: Remove unneeded cast to xmlDocPtr. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 32e9591..67902bd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -632,7 +632,7 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) static inline xmlDocPtr get_doc( domdoc *This ) { - return (xmlDocPtr)This->node.node; + return This->node.node->doc; } static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml )

1 0

Jörg Höhle : winmm: Prevent some MIDI race conditions.
by Alexandre Julliard March 1, 2013

March 1, 2013

Module: wine Branch: master Commit: b0fc000ce1fef6067d921040965e055f5e09d926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc000ce1fef6067d9210409… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 23 09:47:27 2013 +0100 winmm: Prevent some MIDI race conditions. --- dlls/winealsa.drv/midi.c | 37 ++++++++++++++++--------------------- dlls/wineoss.drv/midi.c | 17 ++++++----------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 11b0f30..748fa79 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -389,9 +389,9 @@ static DWORD WINAPI midRecThread(LPVOID arg) * to handle the case where ALSA split the sysex into several events */ if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } } else { @@ -478,6 +478,16 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ERROR; } + MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + + MidiInDev[wDevID].lpQueueHdr = NULL; + MidiInDev[wDevID].dwTotalPlayed = 0; + MidiInDev[wDevID].bufsize = 0x3FFF; + MidiInDev[wDevID].midiDesc = *lpDesc; + MidiInDev[wDevID].state = 0; + MidiInDev[wDevID].incLen = 0; + MidiInDev[wDevID].startTime = 0; + /* Connect our app port to the device port */ if (snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port) < 0) return MMSYSERR_NOTENABLED; @@ -497,16 +507,6 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Created thread for midi-in\n"); } - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].incLen = 0; - MidiInDev[wDevID].startTime = 0; - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; } @@ -644,12 +644,11 @@ static DWORD midReset(WORD wDevID) EnterCriticalSection(&crit_sect); while (MidiInDev[wDevID].lpQueueHdr) { - MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); - MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; + LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -726,10 +725,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) WARN("bad dwFlags\n"); return MMSYSERR_INVALFLAG; } - if (!MidiOutDev[wDevID].bEnabled) { - TRACE("disabled wDevID\n"); - return MMSYSERR_NOTENABLED; - } MidiOutDev[wDevID].lpExtra = 0; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 2b3d433..bd013e1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -563,9 +563,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } if (sbfb && lpMidiHdr != NULL) { lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -906,12 +906,11 @@ static DWORD midReset(WORD wDevID) EnterCriticalSection(&crit_sect); while (MidiInDev[wDevID].lpQueueHdr) { - MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); - MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; + LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); @@ -1102,10 +1101,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) WARN("bad dwFlags\n"); return MMSYSERR_INVALFLAG; } - if (!MidiOutDev[wDevID].bEnabled) { - TRACE("disabled wDevID\n"); - return MMSYSERR_NOTENABLED; - } MidiOutDev[wDevID].lpExtra = 0;

1 0