wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Stefan Dösinger : ddraw: Fix D3DEXECUTEDATA.dwSize handling.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 6f5028337e6f3e1712bafaaa1a0a3bfb983850a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5028337e6f3e1712bafaaa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 5 12:59:13 2018 +0200 ddraw: Fix D3DEXECUTEDATA.dwSize handling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 497287e..89d9ed3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -610,6 +610,12 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + if (data->dwSize != sizeof(*data)) + { + WARN("data->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", data->dwSize); + return DDERR_INVALIDPARAMS; + } + /* Skip past previous vertex data. */ buffer->src_vertex_pos += buffer->data.dwVertexCount; @@ -693,12 +699,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * static HRESULT WINAPI d3d_execute_buffer_GetExecuteData(IDirect3DExecuteBuffer *iface, D3DEXECUTEDATA *data) { struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface); - DWORD dwSize; TRACE("iface %p, data %p.\n", iface, data); - dwSize = data->dwSize; - memcpy(data, &buffer->data, dwSize); + /* Tests show that dwSize is ignored. */ + memcpy(data, &buffer->data, sizeof(*data)); if (TRACE_ON(ddraw)) {

1 0

Akihiro Sagawa : winmm: Fix MEVT_LONGMSG handling in MIDI stream.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 185d98bbfdbf7ef10ef52d0264a5a38aedd3b19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=185d98bbfdbf7ef10ef52d02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 5 00:41:24 2018 +0900 winmm: Fix MEVT_LONGMSG handling in MIDI stream. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 0ea3d92..97cef2d 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -819,7 +819,7 @@ static void test_midiStream(UINT udev, HWND hwnd) e->dwEvent = MEVT_F_LONG | sizeof(SysEx_volume_off); memcpy(&e->dwParms[0], SysEx_volume_off, sizeof(SysEx_volume_off)); p += sizeof(MIDISHORTEVENT) + ROUNDUP4(sizeof(SysEx_volume_off)); - /* Note On (FIXME: we shouldn't hear this voice due to volume settings) */ + /* Note On (We can't hear this voice due to volume settings) */ e = (MIDIEVENT *)p; e->dwEvent = MEVT_F_SHORT | 0x6F4593; /* note #69 */ p += sizeof(MIDISHORTEVENT); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 1412d5e..faeb474 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1169,8 +1169,16 @@ start_header: /* do nothing, skip bytes */ break; case MEVT_LONGMSG: - midiOutLongMsg(lpMidiStrm->hDevice, lpMidiStrm->lpMidiHdr, MEVT_EVENTPARM(me->dwEvent)); - break; + { + MIDIHDR mh; + memset(&mh, 0, sizeof(mh)); + mh.lpData = (LPSTR)me->dwParms; + mh.dwBufferLength = MEVT_EVENTPARM(me->dwEvent); + midiOutPrepareHeader(lpMidiStrm->hDevice, &mh, sizeof(mh)); + midiOutLongMsg(lpMidiStrm->hDevice, &mh, sizeof(mh)); + midiOutUnprepareHeader(lpMidiStrm->hDevice, &mh, sizeof(mh)); + break; + } case MEVT_NOP: break; case MEVT_SHORTMSG:

1 0

Akihiro Sagawa : winmm/tests: Add more MIDI System Exclusive message tests.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: cc78101fea11bcf86a954f8c808137bf7ce56fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc78101fea11bcf86a954f8c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 5 00:41:31 2018 +0900 winmm/tests: Add more MIDI System Exclusive message tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 4805123..0ea3d92 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -541,6 +541,7 @@ static void test_midiStream(UINT udev, HWND hwnd) MIDIPROPTEMPO tempo; MIDIPROPTIMEDIV tdiv; } midiprop; + MIDIOUTCAPSA capsA; if (hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); @@ -776,6 +777,78 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamClose(hm); ok(!rc, "midiStreamClose rc=%s\n", mmsys_error(rc)); } + + rc = midiOutGetDevCapsA((UINT_PTR)udev, &capsA, sizeof(capsA)); + ok(!rc, "midiOutGetDevCaps(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + if (!strncmp(capsA.szPname, fluidsynth_prefix, strlen(fluidsynth_prefix)) || + (udev == MIDIMAPPER && found_fluidsynth)) { + found_fluidsynth = TRUE; + skip("FluidSynth (at least 1.1.6) doesn't support desired System Exclusive message.\n"); + return; + } + +#define ROUNDUP4(n) (((n) + 3) & ~3) + hm = NULL; + rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)0, (DWORD_PTR)0, CALLBACK_NULL); + ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + midiprop.tdiv.dwTimeDiv = 480; + rc = midiStreamProperty(hm, (LPBYTE)&midiprop, MIDIPROP_TIMEDIV | MIDIPROP_SET); + ok(!rc, "midiStreamProperty(TimeDiv) rc=%s\n", mmsys_error(rc)); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart rc=%s\n", mmsys_error(rc)); + + memset(&mhdr, 0, sizeof(mhdr)); + mhdr.dwBufferLength = sizeof(MIDISHORTEVENT) * 5 + ROUNDUP4(sizeof(SysEx_reset)) + + ROUNDUP4(sizeof(SysEx_volume_off)) + ROUNDUP4(sizeof(SysEx_volume_full)); + mhdr.lpData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mhdr.dwBufferLength); + ok(mhdr.lpData!=NULL, "No %d bytes of memory!\n", mhdr.dwBufferLength); + if (mhdr.lpData) { + MIDIEVENT *e; + char *p = mhdr.lpData; + /* GM System ON */ + e = (MIDIEVENT *)p; + e->dwEvent = MEVT_F_LONG | sizeof(SysEx_reset); + memcpy(&e->dwParms[0], SysEx_reset, sizeof(SysEx_reset)); + p += sizeof(MIDISHORTEVENT) + ROUNDUP4(sizeof(SysEx_reset)); + /* Master volume: off */ + e = (MIDIEVENT *)p; + e->dwDeltaTime = 96; + e->dwEvent = MEVT_F_LONG | sizeof(SysEx_volume_off); + memcpy(&e->dwParms[0], SysEx_volume_off, sizeof(SysEx_volume_off)); + p += sizeof(MIDISHORTEVENT) + ROUNDUP4(sizeof(SysEx_volume_off)); + /* Note On (FIXME: we shouldn't hear this voice due to volume settings) */ + e = (MIDIEVENT *)p; + e->dwEvent = MEVT_F_SHORT | 0x6F4593; /* note #69 */ + p += sizeof(MIDISHORTEVENT); + /* Note Off */ + e = (MIDIEVENT *)p; + e->dwDeltaTime = 240; + e->dwEvent = MEVT_F_SHORT | 0x004593; /* velocity 0 */ + p += sizeof(MIDISHORTEVENT); + /* Master volume: full */ + e = (MIDIEVENT *)p; + e->dwEvent = MEVT_F_LONG | sizeof(SysEx_volume_full); + memcpy(&e->dwParms[0], SysEx_volume_full, sizeof(SysEx_volume_full)); + p += sizeof(MIDISHORTEVENT) + ROUNDUP4(sizeof(SysEx_volume_full)); + mhdr.dwBytesRecorded = (DWORD)(p - mhdr.lpData); +#undef ROUNDUP4 + + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + + rc = playStream(hm, &mhdr); + ok(!rc, "midiStreamOut rc=%s\n", mmsys_error(rc)); + + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + + HeapFree(GetProcessHeap(), 0, mhdr.lpData); + } + rc = midiStreamClose(hm); + ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); } static BOOL scan_subkeys(HKEY parent, const LPCSTR *sub_keys)

1 0

Akihiro Sagawa : midimap: Open lower devices when opening MIDI Mapper.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: ec6bd187fe80a8e3109110398211658d6fb1030d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6bd187fe80a8e310911039… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 5 00:40:44 2018 +0900 midimap: Open lower devices when opening MIDI Mapper. Without this change, the lower device can't get a long message at the beginning. The mapper didn't open it before receiving a short message in modData function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 27 ++++++++++++++------------- dlls/winmm/tests/midi.c | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 16707bb..1b35da7 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -283,13 +283,25 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (MIDIMAP_LoadSettings(mom)) { + UINT chn; *lpdwUser = (DWORD_PTR)mom; mom->self = mom; - mom->wCbFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); mom->midiDesc = *lpDesc; - MIDIMAP_NotifyClient(mom, MOM_OPEN, 0L, 0L); + for (chn = 0; chn < 16; chn++) + { + if (mom->ChannelMap[chn]->loaded) continue; + if (midiOutOpen(&mom->ChannelMap[chn]->hMidi, mom->ChannelMap[chn]->uDevID, + 0L, 0L, CALLBACK_NULL) == MMSYSERR_NOERROR) + mom->ChannelMap[chn]->loaded = 1; + else + mom->ChannelMap[chn]->loaded = -1; + /* FIXME: should load here the IDF midi data... and allow channel and + * patch mappings + */ + } + MIDIMAP_NotifyClient(mom, MOM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; } HeapFree(GetProcessHeap(), 0, mom); @@ -381,17 +393,6 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) case 0xC0: case 0xD0: case 0xE0: - if (mom->ChannelMap[chn]->loaded == 0) - { - if (midiOutOpen(&mom->ChannelMap[chn]->hMidi, mom->ChannelMap[chn]->uDevID, - 0L, 0L, CALLBACK_NULL) == MMSYSERR_NOERROR) - mom->ChannelMap[chn]->loaded = 1; - else - mom->ChannelMap[chn]->loaded = -1; - /* FIXME: should load here the IDF midi data... and allow channel and - * patch mappings - */ - } if (mom->ChannelMap[chn]->loaded > 0) { /* change channel */ diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 763ed2f..4805123 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -461,7 +461,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) trace("ShortMsg type %x (muted)\n", LOBYTE(LOWORD(e))); rc = midiOutShortMsg(hm, e); ok(!rc, "midiOutShortMsg rc=%s\n", mmsys_error(rc)); - /* FIXME (for MIDI Mapper): we shouldn't hear this voice due to volume settings */ + /* We can't hear this voice due to volume settings */ if (!rc) Sleep(200); rc = midiOutShortMsg(hm, 0x00004593); /* velocity 0 */

1 0

Akihiro Sagawa : winmm/tests: Add MIDI System Exclusive message tests.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 96896023ff376577c826b574675c07344a4395fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=96896023ff376577c826b574… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 5 00:40:42 2018 +0900 winmm/tests: Add MIDI System Exclusive message tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 1024c2c..763ed2f 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -256,6 +256,17 @@ static void test_midi_mci(HWND hwnd) if(!err) ok(!strcmp(buf, "false"), "capability can record is %s\n", buf); } +static BYTE SysEx_reset[] = { + 0xF0, 0x7E, 0x7F, 0x09, 0x01, 0xF7 /* GM System ON */ +}; +static BYTE SysEx_volume_off[] = { + 0xF0, 0x7F, 0x7F, 0x04, 0x01, 0x00, 0x00, 0xF7 +}; +static BYTE SysEx_volume_full[] = { + 0xF0, 0x7F, 0x7F, 0x04, 0x01, 0x00, 0x7F, 0xF7 +}; +static BOOL found_fluidsynth; +const static char fluidsynth_prefix[] = "Synth input port "; static void test_midiOut_device(UINT udev, HWND hwnd) { @@ -415,6 +426,59 @@ static void test_midiOut_device(UINT udev, HWND hwnd) test_notification(hwnd, "midiOutClose", 0, WHATEVER); } test_notification(hwnd, "midiOut over", 0, WHATEVER); + if (!strncmp(capsA.szPname, fluidsynth_prefix, strlen(fluidsynth_prefix)) || + (udev == MIDIMAPPER && found_fluidsynth)) { + found_fluidsynth = TRUE; + skip("FluidSynth (at least 1.1.6) doesn't support desired System Exclusive message.\n"); + return; + } + + rc = midiOutOpen(&hm, udev, 0, (DWORD_PTR)0, CALLBACK_NULL); + ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + memset(&mhdr, 0, sizeof(mhdr)); + mhdr.lpData = (LPSTR)SysEx_reset; + mhdr.dwBufferLength = sizeof(SysEx_reset); + rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + rc = midiOutLongMsg(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); + rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + Sleep(60); + + mhdr.lpData = (LPSTR)SysEx_volume_off; + mhdr.dwBufferLength = sizeof(SysEx_volume_off); + rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + rc = midiOutLongMsg(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); + rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + + { + DWORD e = 0x006F4593; /* velocity 111, note #69, channel 4 */ + trace("ShortMsg type %x (muted)\n", LOBYTE(LOWORD(e))); + rc = midiOutShortMsg(hm, e); + ok(!rc, "midiOutShortMsg rc=%s\n", mmsys_error(rc)); + /* FIXME (for MIDI Mapper): we shouldn't hear this voice due to volume settings */ + if (!rc) Sleep(200); + + rc = midiOutShortMsg(hm, 0x00004593); /* velocity 0 */ + ok(!rc, "midiOutShortMsg rc=%s\n", mmsys_error(rc)); + } + + mhdr.lpData = (LPSTR)SysEx_volume_full; + mhdr.dwBufferLength = sizeof(SysEx_volume_full); + rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + rc = midiOutLongMsg(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); + rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + + rc = midiOutClose(hm); + ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); } static void test_position(HMIDISTRM hm, UINT typein, UINT typeout)

1 0

Giovanni Mascellani : d2d1: Fix outline join drawing.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: abbffd2ee2412faaa15319735065eb156b5c265b URL: https://source.winehq.org/git/wine.git/?a=commit;h=abbffd2ee2412faaa1531973… Author: Giovanni Mascellani <g.mascellani(a)gmail.com> Date: Tue Apr 3 17:32:46 2018 +0200 d2d1: Fix outline join drawing. Calling d2d_outline_vertex_set(x, y, 0, 0, 0, 0) causes a normalize() to be invoked with a zero vector in the vertex shader vs_code_bezier_outline. This gives rise to an undefinite result, that in some cases causes the join triangles to be dropped. Tested on Debian unstable. Signed-off-by: Giovanni Mascellani <g.mascellani(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 5b5a75b..d716fb1 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2136,14 +2136,14 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } else if (ccw < 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); } else { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y);

1 0

André Hentschel : msvcrt: Don' t increment variables both in the loop header and body (clang).
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 807d47d44820261b0678e3aa419ea5d5008d5b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=807d47d44820261b0678e3aa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 31 14:19:41 2018 +0200 msvcrt: Don't increment variables both in the loop header and body (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 7ca1906..430c2a6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2011,13 +2011,12 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { if (_ismbblead(*p)) { - for (q = set; *q; q++) + for (q = set; *q; q += 2) { if (!q[1]) break; if ((*p == *q) && (p[1] == q[1])) break; - q++; } if (!q[0] || !q[1]) break; } @@ -2043,13 +2042,12 @@ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* { if (_ismbblead(*p)) { - for (q = set; *q; q++) + for (q = set; *q; q += 2) { if (!q[1]) break; if ((*p == *q) && (p[1] == q[1])) break; - q++; } if (!q[0] || !q[1]) break; }

1 0

Jeremy Newman : add perm news blurb about wineconf
by Jeremy Newman 05 Apr '18

05 Apr '18

Module: website Branch: master Commit: 941ab4df439b4e0f76ec1b1a3e69a484feac7b08 URL: https://source.winehq.org/git/website.git/?a=commit;h=941ab4df439b4e0f76ec1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 5 13:35:25 2018 -0500 add perm news blurb about wineconf --- templates/en/home.template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/templates/en/home.template b/templates/en/home.template index d525e1a..4f16328 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -86,6 +86,20 @@ <h1 class="title"><a href="{$root}/news">News and Updates</a></h1> + <p class="newstitle"><a href="/news/2018030801">WineConf 2018 - 25th anniversary</a></p> + <div class="newsblock"> + <p>The Wine Project is pleased to announce that WineConf 2018 will + take place on June 29 - July 1 2018 in The Hague, The + Netherlands. This will coincide with the 25th anniversary of Wine.</p> + <p>WineConf is the Wine Project's annual conference, where members of + the Wine community, the broader Free Software community and interested + users meet up over food and beverages. We traditionally also have a + number of talks by attendees, as well as some formal and informal + discussions about anything vaguely Wine related.</p> + <p>Please see the <a href="https://wiki.winehq.org/WineConf2018">WineConf2018 page</a> + for further details.</p> + </div> +  <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> more news...</a></p>

1 0

Jacek Caban : jscript: Allow using reserved words as identifiers in ES5 mode.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: 3263d51a1fd86abf195c5be224f6fdb4db284b53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3263d51a1fd86abf195c5be2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 21:43:19 2018 +0200 jscript: Allow using reserved words as identifiers in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 2 +- dlls/jscript/parser.y | 58 ++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 18 ++++++++++++ dlls/mshtml/tests/es5.js | 43 ++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3523958..b4f6d95 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -135,7 +135,7 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lva return 1; if(lval) - *lval = ctx->ptr; + *lval = word; ctx->ptr = p1; return 0; } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 59e6757..a40b813 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -164,11 +164,11 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN -%token kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kIN +%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL -%token <srcptr> kFUNCTION '}' +%token <srcptr> '}' /* tokens */ %token <identifier> tIdentifier @@ -241,6 +241,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <literal> BooleanLiteral %type <srcptr> KFunction %type <ival> AssignOper +%type <identifier> IdentifierName ReservedAsIdentifier %nonassoc LOWER_THAN_ELSE %nonassoc kELSE @@ -272,7 +273,7 @@ FunctionExpression { $$ = new_function_expression(ctx, $4, $6, $9, $2, $1, $10-$1+1); } KFunction - : kFUNCTION { $$ = $1; } + : kFUNCTION { $$ = ctx->ptr - 8; } /* ECMA-262 3rd Edition 13 */ FunctionBody @@ -711,7 +712,7 @@ MemberExpression | FunctionExpression { $$ = $1; } | MemberExpression '[' Expression ']' { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); } - | MemberExpression '.' tIdentifier + | MemberExpression '.' IdentifierName { $$ = new_member_expression(ctx, $1, $3); } | kNEW MemberExpression Arguments { $$ = new_new_expression(ctx, $2, $3); } @@ -724,7 +725,7 @@ CallExpression { $$ = new_call_expression(ctx, $1, $2); } | CallExpression '[' Expression ']' { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); } - | CallExpression '.' tIdentifier + | CallExpression '.' IdentifierName { $$ = new_member_expression(ctx, $1, $3); } /* ECMA-262 3rd Edition 11.2 */ @@ -787,7 +788,7 @@ PropertyNameAndValueList /* ECMA-262 3rd Edition 11.1.5 */ PropertyName - : tIdentifier { $$ = new_string_literal(ctx, $1); } + : IdentifierName { $$ = new_string_literal(ctx, $1); } | tStringLiteral { $$ = new_string_literal(ctx, $1); } | tNumericLiteral { $$ = $1; } @@ -796,6 +797,49 @@ Identifier_opt : /* empty*/ { $$ = NULL; } | tIdentifier { $$ = $1; } +/* ECMA-262 5.1 Edition 7.6 */ +IdentifierName + : tIdentifier { $$ = $1; } + | ReservedAsIdentifier + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("%s keyword used as an identifier in legacy mode.\n", + debugstr_w($1)); + YYABORT; + } + $$ = $1; + } + +ReservedAsIdentifier + : kBREAK { $$ = $1; } + | kCASE { $$ = $1; } + | kCATCH { $$ = $1; } + | kCONTINUE { $$ = $1; } + | kDEFAULT { $$ = $1; } + | kDELETE { $$ = $1; } + | kDO { $$ = $1; } + | kELSE { $$ = $1; } + | kFALSE { $$ = $1; } + | kFINALLY { $$ = $1; } + | kFOR { $$ = $1; } + | kFUNCTION { $$ = $1; } + | kIF { $$ = $1; } + | kIN { $$ = $1; } + | kINSTANCEOF { $$ = $1; } + | kNEW { $$ = $1; } + | kNULL { $$ = $1; } + | kRETURN { $$ = $1; } + | kSWITCH { $$ = $1; } + | kTHIS { $$ = $1; } + | kTHROW { $$ = $1; } + | kTRUE { $$ = $1; } + | kTRY { $$ = $1; } + | kTYPEOF { $$ = $1; } + | kVAR { $$ = $1; } + | kVOID { $$ = $1; } + | kWHILE { $$ = $1; } + | kWITH { $$ = $1; } + /* ECMA-262 3rd Edition 7.8 */ Literal : kNULL { $$ = new_null_literal(ctx); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index b9ac40e..21a3582 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -116,6 +116,20 @@ function test_javascript() { ok(!(func in obj), func + " found in " + obj); } + function test_parses(code, expect) { + var success; + try { + eval(code); + success = true; + }catch(e) { + success = false; + } + if(expect) + ok(success === true, code + " did not parse"); + else + ok(success === false, code + " parsed"); + } + var v = document.documentMode; test_exposed("ScriptEngineMajorVersion", g, true); @@ -125,6 +139,10 @@ function test_javascript() { test_exposed("isArray", Array, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); + test_parses("if(false) { o.default; }", v >= 9); + test_parses("if(false) { o.with; }", v >= 9); + test_parses("if(false) { o.if; }", v >= 9); + next_test(); } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 9f87e99..9b0dc21 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -73,8 +73,49 @@ function test_isArray() { next_test(); } +function test_identifier_keywords() { + var o = { + if: 1, + default: 2, + function: 3, + break: true, + case: true, + catch: true, + continue: true, + delete: true, + do: true, + else: true, + finally: true, + for: true, + in: true, + instanceof: true, + new: true, + return: true, + switch: true, + throw: true, + try: true, + typeof: true, + var: true, + void: true, + while: true, + with: true, + true: true, + false: true, + null: true, + this: true + }; + function ro() { return o; }; + + ok(o.if === 1, "o.if = " + o.if); + ok(ro().default === 2, "ro().default = " + ro().default); + ok(o.false === true, "o.false = " + o.false); + + next_test(); +} + var tests = [ test_date_now, test_indexOf, - test_isArray + test_isArray, + test_identifier_keywords ];

1 0

Huw Davies : user32: Avoid using the comma operator in a while condition.
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: da943f2c089a0dd32fb727ed1d09e7e00680c6ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=da943f2c089a0dd32fb727ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 19:32:15 2018 +0100 user32: Avoid using the comma operator in a while condition. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7d1f6b3..6f23c74 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1582,9 +1582,9 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious ) */ retvalue = hwndCtrl; hwnd = hwndCtrl; - while (hwndNext = GetWindow (hwnd, GW_HWNDNEXT), - 1) + while (1) { + hwndNext = GetWindow (hwnd, GW_HWNDNEXT); while (!hwndNext) { /* Climb out until there is a next sibling of the ancestor or we

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018