wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Alexandre Julliard : Release 3.8.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 7280f7fb744e951281e7f051c347fb8fef5ab36b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7280f7fb744e951281e7f051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:20:21 2018 +0200 Release 3.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 643 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 304 insertions(+), 361 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7280f7fb744e951281e7…

1 0

Akihiro Sagawa : winmm: Avoid casting unsigned char to plain char.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 107dba39a3d50f8511a2e4031066bfecfc1105b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107dba39a3d50f8511a2e403… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue May 8 22:02:12 2018 +0900 winmm: Avoid casting unsigned char to plain char. 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/winmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 58a7672..b97580e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -956,7 +956,7 @@ static DWORD MMSYSTEM_MidiStream_Convert(WINE_MIDIStream* lpMidiStrm, DWORD puls if (lpMidiStrm->dwTimeDiv == 0) { FIXME("Shouldn't happen. lpMidiStrm->dwTimeDiv = 0\n"); } else if (lpMidiStrm->dwTimeDiv > 0x8000) { /* SMPTE, unchecked FIXME? */ - int nf = -(char)HIBYTE(lpMidiStrm->dwTimeDiv); /* number of frames */ + int nf = 256 - HIBYTE(lpMidiStrm->dwTimeDiv); /* number of frames */ int nsf = LOBYTE(lpMidiStrm->dwTimeDiv); /* number of sub-frames */ ret = (pulse * 1000) / (nf * nsf); } else {

1 0

Akihiro Sagawa : winmm: Fix default time division value in MIDI stream.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 1d499396189e7353dfda31a84dd89bb13f2747f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d499396189e7353dfda31a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue May 8 22:02:10 2018 +0900 winmm: Fix default time division value 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 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 97cef2d..b0efe16 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -565,7 +565,7 @@ static void test_midiStream(UINT udev, HWND hwnd) midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_GET|MIDIPROP_TIMEDIV); ok(!rc, "midiStreamProperty TIMEDIV rc=%s\n", mmsys_error(rc)); - todo_wine ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv); + ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv); memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwUser = 0x56FA552C; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index faeb474..58a7672 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1277,8 +1277,8 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (!lpMidiStrm) return MMSYSERR_NOMEM; - lpMidiStrm->dwTempo = 500000; - lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/ + lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ + lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->dwPositionMS = 0; mosm.dwStreamID = (DWORD)lpMidiStrm;

1 0

Nikolay Sivov : dsound: Use correct pointer type.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 339d9e3a6aff7cedceeb8b11337a6a1ce9734643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339d9e3a6aff7cedceeb8b11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 10:55:11 2018 +0300 dsound: Use correct pointer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1180594..9b3e730 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -699,7 +699,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (!pad_frames) WARN("Probable buffer underrun\n"); - hr = IAudioRenderClient_GetBuffer(device->render, frames, (void*)&buffer); + hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); if(FAILED(hr)){ WARN("GetBuffer failed: %08x\n", hr); LeaveCriticalSection(&device->mixlock);

1 0

Nikolay Sivov : gdiplus: Draw using actual point data for custom caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 3d8bd665116e2a804c9ea2f25250c1827049ba8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8bd665116e2a804c9ea2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:48 2018 +0300 gdiplus: Draw using actual point data for custom caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a7e5c80..5fdbaf1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1709,9 +1709,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s GdipTranslateMatrix(&matrix, x2, y2, MatrixOrderAppend); GdipTransformMatrixPoints(&matrix, custptf, count); - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, custptf, count); - round_points(pt, ptf, 3); + round_points(custpt, custptf, count); for(i = 0; i < count; i++) tp[i] = convert_path_point_type(custom->pathdata.Types[i]);

1 0

Nikolay Sivov : gdiplus: Fix the number of transformed points for round caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: cd228c281556c1fca2031cac99b40f971832354b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd228c281556c1fca2031cac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:47 2018 +0300 gdiplus: Fix the number of transformed points for round caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 478039e..a7e5c80 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1680,9 +1680,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 + dx; ptf[3].Y = y2 + dy; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 4); - round_points(pt, ptf, 3); + round_points(pt, ptf, 4); Pie(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y, pt[2].x, pt[2].y, pt[3].x, pt[3].y);

1 0

Nikolay Sivov : gdiplus: Convert actually used points for anchored round caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 5436cfc9b67c51d88a1525c661db24a88ec68d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5436cfc9b67c51d88a1525c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:46 2018 +0300 gdiplus: Convert actually used points for anchored round caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6635dea..478039e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1634,9 +1634,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[1].X = x2 + dx; ptf[1].Y = y2 + dy; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 2); - round_points(pt, ptf, 3); + round_points(pt, ptf, 2); Ellipse(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);

1 0

Nikolay Sivov : gdiplus: Fix the number of transformed points for squared caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: aad491b0cf8987355469abbbeb034243e2b95551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad491b0cf8987355469abbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:45 2018 +0300 gdiplus: Fix the number of transformed points for squared caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index acee695..6635dea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1594,9 +1594,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 - dbig; ptf[2].X = x2 + dsmall; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 4); - round_points(pt, ptf, 3); + round_points(pt, ptf, 4); Polygon(graphics->hdc, pt, 4);

1 0

Zebediah Figura : mp3dmod: Implement ProcessOutput().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: a138090273a12f6c1e15f11f72a9b29c763bdc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a138090273a12f6c1e15f11f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 11 10:18:13 2018 -0500 mp3dmod: Implement ProcessOutput(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/mediaobj.idl | 7 +++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0d62468..d517c8e 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <mpg123.h> #include "windef.h" #include "winbase.h" @@ -289,11 +290,76 @@ static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, return S_OK; } +static DWORD get_framesize(DMO_MEDIA_TYPE *type) +{ + WAVEFORMATEX *format = (WAVEFORMATEX *)type->pbFormat; + return 1152 * format->nBlockAlign; +} + static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("(%p)->(%x, %d, %p, %p) stub!\n", iface, flags, count, buffers, status); + struct mp3_decoder *This = impl_from_IMediaObject(iface); + DWORD len, maxlen, framesize; + int got_data = 0; + size_t written; + HRESULT hr; + BYTE *data; + int err; - return E_NOTIMPL; + TRACE("(%p)->(%#x, %d, %p, %p)\n", iface, flags, count, buffers, status); + + if (count > 1) + FIXME("Multiple buffers not handled.\n"); + + buffers[0].dwStatus = 0; + + if (!This->buffer) + return S_FALSE; + + buffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT; + + hr = IMediaBuffer_GetBufferAndLength(buffers[0].pBuffer, &data, &len); + if (FAILED(hr)) return hr; + + hr = IMediaBuffer_GetMaxLength(buffers[0].pBuffer, &maxlen); + if (FAILED(hr)) return hr; + + framesize = get_framesize(&This->outtype); + + while (1) + { + if (maxlen - len < framesize) + { + buffers[0].dwStatus |= DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; + break; + } + + while ((err = mpg123_read(This->mh, data + len, framesize, &written)) == MPG123_NEW_FORMAT); + if (err == MPG123_NEED_MORE) + { + IMediaBuffer_Release(This->buffer); + This->buffer = NULL; + break; + } + else if (err == MPG123_ERR) + ERR("mpg123_read() failed: %s\n", mpg123_strerror(This->mh)); + else if (err != MPG123_OK) + ERR("mpg123_read() returned %d\n", err); + if (written < framesize) + ERR("short write: %zd/%u\n", written, framesize); + + got_data = 1; + + len += framesize; + hr = IMediaBuffer_SetLength(buffers[0].pBuffer, len); + if (FAILED(hr)) return hr; + } + + if (got_data) + { + return S_OK; + } + return S_FALSE; } static HRESULT WINAPI MediaObject_Lock(IMediaObject *iface, LONG lock) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index b6ae236..7759921 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -107,6 +107,13 @@ enum _DMO_SET_TYPE_FLAGS { DMO_SET_TYPEF_CLEAR = 0x00000002, }; +enum _DMO_OUTPUT_DATA_BUFFERF_FLAGS { + DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_OUTPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004, + DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x01000000, +}; + /***************************************************************************** * IMediaObject interface */

1 0

Zebediah Figura : mp3dmod: Implement ProcessInput().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: b5815f1dd3d44e4d73423c52d9d1f9cfbf1c4a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5815f1dd3d44e4d73423c52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 11 10:18:12 2018 -0500 mp3dmod: Implement ProcessInput(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index b9a4829..0d62468 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -41,6 +41,7 @@ struct mp3_decoder { LONG ref; mpg123_handle *mh; DMO_MEDIA_TYPE outtype; + IMediaBuffer *buffer; }; static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) @@ -256,10 +257,36 @@ static HRESULT WINAPI MediaObject_GetInputStatus(IMediaObject *iface, DWORD inde static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - FIXME("(%p)->(%d, %p, %#x, %s, %s) stub!\n", iface, index, buffer, flags, + struct mp3_decoder *This = impl_from_IMediaObject(iface); + HRESULT hr; + BYTE *data; + DWORD len; + int err; + + TRACE("(%p)->(%d, %p, %#x, %s, %s)\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); - return E_NOTIMPL; + if (This->buffer) + { + ERR("Already have a buffer.\n"); + return DMO_E_NOTACCEPTING; + } + + IMediaBuffer_AddRef(buffer); + This->buffer = buffer; + + hr = IMediaBuffer_GetBufferAndLength(buffer, &data, &len); + if (FAILED(hr)) + return hr; + + err = mpg123_feed(This->mh, data, len); + if (err != MPG123_OK) + { + ERR("mpg123_feed() failed: %s\n", mpg123_strerror(This->mh)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) @@ -308,7 +335,7 @@ static HRESULT create_mp3_decoder(REFIID iid, void **obj) struct mp3_decoder *This; int err; - if (!(This = heap_alloc(sizeof(*This)))) + if (!(This = heap_alloc_zero(sizeof(*This)))) return E_OUTOFMEMORY; This->IMediaObject_iface.lpVtbl = &IMediaObject_vtbl; @@ -316,6 +343,7 @@ static HRESULT create_mp3_decoder(REFIID iid, void **obj) mpg123_init(); This->mh = mpg123_new(NULL, &err); + mpg123_open_feed(This->mh); mpg123_format_none(This->mh); return IMediaObject_QueryInterface(&This->IMediaObject_iface, iid, obj);

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
72
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 May 2018