May 2018 - Wine-Commits - list.winehq.org

Daniel Rusek : po: Update Czech translation.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: e3796fab3ca2e1076bc8e1c25f6b63731877cb9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3796fab3ca2e1076bc8e1c2… Author: Daniel Rusek <mail(a)asciiwolf.com> Date: Sun May 13 14:52:53 2018 +0200 po: Update Czech translation. Signed-off-by: Daniel Rusek <mail(a)asciiwolf.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/cs.po | 595 +++++++++++++++++++++------------------------------------------ 1 file changed, 195 insertions(+), 400 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3796fab3ca2e1076bc8…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 2e29e658b44e777b73424b6b46b728c981a990b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e29e658b44e777b73424b6b… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri May 11 22:09:20 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index edf843e..5f32968 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-09 21:12+0300\n" +"PO-Revision-Date: 2018-05-11 22:08+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3693,18 +3693,20 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"savybės aprašo atributas „writable“ negali būti nustatytas į „tiesa“ šiam " +"objektui" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Negalima iš naujo apibrėžti nekonfigūruojamos savybės „|“" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Negalima modifikuoti nerašomos savybės „|“" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Savybė negali turėti ir kreipiklių, ir reikšmės" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL"

1 0

Alistair Leslie-Hughes : shell32: Choose return value for SHFileOperationA depending on windows version.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: c88a65f2abba4e471bd60b68ff10da1a11fb60cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c88a65f2abba4e471bd60b68… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 14 02:03:15 2018 +0000 shell32: Choose return value for SHFileOperationA depending on windows version. Based on a patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..c7bd54d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -882,6 +882,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); + /* Windows 95/98 returns S_OK for this case. */ + if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) + retCode = S_OK; + heap_free(ForFree); /* we cannot use wString, it was changed */ break; }

1 0

Nikolay Sivov : dxgi: Add IDXGIDevice2 stub.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: e4034dcc838b01a8c41de08c63d3db4b4906890f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4034dcc838b01a8c41de08c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 1 08:21:18 2018 +0300 dxgi: Add IDXGIDevice2 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 30 ++++++++++++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5a810fa..2c85c1d 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -41,6 +41,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) + || IsEqualGUID(riid, &IID_IDXGIDevice2) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -275,6 +276,31 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDev return E_NOTIMPL; } +static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, DXGI_OFFER_RESOURCE_PRIORITY priority) +{ + FIXME("iface %p, resource_count %u, resources %p, priority %u stub!\n", iface, resource_count, + resources, priority); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_ReclaimResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, BOOL *discarded) +{ + FIXME("iface %p, resource_count %u, resources %p, discarded %p stub!\n", iface, resource_count, + resources, discarded); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *iface, HANDLE event) +{ + FIXME("iface %p, event %p stub!\n", iface, event); + + return E_NOTIMPL; +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -355,6 +381,10 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = /* IDXGIDevice1 methods */ dxgi_device_SetMaximumFrameLatency, dxgi_device_GetMaximumFrameLatency, + /* IDXGIDevice2 methods */ + dxgi_device_OfferResources, + dxgi_device_ReclaimResources, + dxgi_device_EnqueueSetEvent, /* IWineDXGIDevice methods */ dxgi_device_create_surface, dxgi_device_create_swapchain, diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 2c57342..3a1d6fa 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -25,7 +25,7 @@ import "dxgi1_5.idl"; local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice1 +interface IWineDXGIDevice : IDXGIDevice2 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture,

1 0

Matteo Bruni : wined3d: Don't add pixel center offset twice.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: ede35244d78e149ed32d4bd449e8102957567a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ede35244d78e149ed32d4bd4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:00 2018 +0200 wined3d: Don't add pixel center offset twice. Fixes cf312011c0e1f43123682f7f2e783174fea65425. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87c7346..175fd14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4091,13 +4091,10 @@ static void viewport_miscpart_cc(struct wined3d_context *context, for (i = 0; i < state->viewport_count; ++i) { - vp[i].x += pixel_center_offset; - vp[i].y += pixel_center_offset; - depth_ranges[i * 2] = vp[i].min_z; depth_ranges[i * 2 + 1] = vp[i].max_z; - viewports[i * 4 ] = vp[i].x + pixel_center_offset; + viewports[i * 4] = vp[i].x + pixel_center_offset; viewports[i * 4 + 1] = vp[i].y + pixel_center_offset; viewports[i * 4 + 2] = vp[i].width; viewports[i * 4 + 3] = vp[i].height;

1 0

Dmitry Timoshkov : mstask/tests: Add another set of tests for trigger management.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 6dd096c3d129623d7c06508d680a32507ba5e2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd096c3d129623d7c06508d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 14 15:49:22 2018 +0800 mstask/tests: Add another set of tests for trigger management. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_trigger.c | 153 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index fe757e8..ab99af7 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -28,6 +28,13 @@ static ITaskScheduler *test_task_scheduler; +static DWORD obj_refcount(void *obj_to_check) +{ + IUnknown *obj = obj_to_check; + IUnknown_AddRef(obj); + return IUnknown_Release(obj); +} + static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) { @@ -453,6 +460,151 @@ static void test_GetNextRunTime(void) ITask_Release(task); } +static HRESULT get_task_trigger(ITask *task, WORD idx, TASK_TRIGGER *state) +{ + HRESULT hr; + ITaskTrigger *trigger; + + hr = ITask_GetTrigger(task, idx, &trigger); + if (hr != S_OK) return hr; + + memset(state, 0x11, sizeof(*state)); + hr = ITaskTrigger_GetTrigger(trigger, state); + + ITaskTrigger_Release(trigger); + return hr; +} + +static void test_trigger_manager(void) +{ + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + HRESULT hr; + ITask *task; + ITaskTrigger *trigger0, *trigger1; + TASK_TRIGGER state0, state1, state; + WORD count, idx; + DWORD ref; + + hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger0); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); +todo_wine + ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger1); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 1, "got %u\n", idx); +todo_wine + ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 2, "got %u\n", count); + + hr = ITaskTrigger_GetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + state0.wBeginYear = 3000; + state0.rgFlags = 0; + state0.TriggerType = TASK_TIME_TRIGGER_ONCE; + hr = ITaskTrigger_SetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); +todo_wine + ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); + + hr = ITaskTrigger_GetTrigger(trigger1, &state1); + ok(hr == S_OK, "got %#x\n", hr); + state1.wBeginYear = 2000; + state1.rgFlags = 0; + state1.TriggerType = TASK_TIME_TRIGGER_DAILY; + hr = ITaskTrigger_SetTrigger(trigger1, &state1); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 1, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + ref = ITaskTrigger_Release(trigger0); + ok(ref == 0, "got %u\n", ref); + ref = ITaskTrigger_Release(trigger1); + ok(ref == 0, "got %u\n", ref); + + ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); +todo_wine + ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); + + hr = get_task_trigger(task, 1, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + hr = ITask_GetTrigger(task, 0, &trigger0); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITask_GetTrigger(task, 1, &trigger1); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + hr = get_task_trigger(task, 1, &state); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + hr = ITaskTrigger_SetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITaskTrigger_SetTrigger(trigger1, &state1); +todo_wine + ok(hr == E_FAIL, "got %#x\n", hr); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 1, "got %u\n", count); + +todo_wine + ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + + ref = ITaskTrigger_Release(trigger0); + ok(ref == 0, "got %u\n", ref); + + ref = ITaskTrigger_Release(trigger1); + ok(ref == 0, "got %u\n", ref); + + ref = ITask_Release(task); + ok(ref == 0, "got %u\n", ref); +} + START_TEST(task_trigger) { HRESULT hr; @@ -466,6 +618,7 @@ START_TEST(task_trigger) test_SetTrigger_GetTrigger(); test_task_trigger(); test_GetNextRunTime(); + test_trigger_manager(); ITaskScheduler_Release(test_task_scheduler); CoUninitialize();

1 0

Dmitry Timoshkov : mstask: ITaskTrigger::GetTrigger() should fail on NULL input.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 999922f7f326dae4ed5ad664006d2f380ba89e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=999922f7f326dae4ed5ad664… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 14 15:49:20 2018 +0800 mstask: ITaskTrigger::GetTrigger() should fail on NULL input. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task_trigger.c | 2 ++ dlls/mstask/tests/task_trigger.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 6d11817..0f24e1f 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -211,6 +211,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( TRACE("(%p, %p)\n", iface, pTrigger); + if (!pTrigger) return E_INVALIDARG; + /* Native implementation doesn't verify equivalent cbTriggerSize fields */ /* Copy relevant fields of the structure */ diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index e22b2ae..fe757e8 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -139,6 +139,9 @@ static void test_SetTrigger_GetTrigger(void) hres = ITaskTrigger_SetTrigger(test_trigger, NULL); ok(hres == E_INVALIDARG, "got %#x\n", hres); + hres = ITaskTrigger_GetTrigger(test_trigger, NULL); + ok(hres == E_INVALIDARG, "got %#x\n", hres); + /* Setup a trigger with base values for this test run */ GetLocalTime(&time); empty_trigger_state.wStartHour = time.wHour;

1 0

Dmitry Timoshkov : mstask/tests: Make task tests independent.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 0ec4e9d21657837285b97a69340da5069b4283be URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec4e9d21657837285b97a69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 14 15:49:10 2018 +0800 mstask/tests: Make task tests independent. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 155 ++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ec4e9d21657837285b9…

1 0

Zebediah Figura : mp3dmod: Return timestamp and length from ProcessOutput( ).
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: e1b4aa542eaaed1c5cdbd1fc02fe251d3e06d5d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b4aa542eaaed1c5cdbd1fc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 13 00:51:36 2018 -0500 mp3dmod: Return timestamp and length from ProcessOutput(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 15 +++++++++++++++ dlls/mp3dmod/tests/mp3dmod.c | 23 +++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index d517c8e..fa1cce5 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -43,6 +43,7 @@ struct mp3_decoder { mpg123_handle *mh; DMO_MEDIA_TYPE outtype; IMediaBuffer *buffer; + REFERENCE_TIME timestamp; }; static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) @@ -296,9 +297,16 @@ static DWORD get_framesize(DMO_MEDIA_TYPE *type) return 1152 * format->nBlockAlign; } +static REFERENCE_TIME get_frametime(DMO_MEDIA_TYPE *type) +{ + WAVEFORMATEX *format = (WAVEFORMATEX *)type->pbFormat; + return (REFERENCE_TIME) 10000000 * 1152 / format->nSamplesPerSec; +} + static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { struct mp3_decoder *This = impl_from_IMediaObject(iface); + REFERENCE_TIME time = 0, frametime; DWORD len, maxlen, framesize; int got_data = 0; size_t written; @@ -325,6 +333,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags if (FAILED(hr)) return hr; framesize = get_framesize(&This->outtype); + frametime = get_frametime(&This->outtype); while (1) { @@ -353,10 +362,16 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags len += framesize; hr = IMediaBuffer_SetLength(buffers[0].pBuffer, len); if (FAILED(hr)) return hr; + + time += frametime; } if (got_data) { + buffers[0].dwStatus |= (DMO_OUTPUT_DATA_BUFFERF_TIME | DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH); + buffers[0].rtTimelength = time; + buffers[0].rtTimestamp = This->timestamp; + This->timestamp += time; return S_OK; } return S_FALSE; diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index e1c5f2b..68c6b4d 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -35,6 +35,11 @@ DEFINE_GUID(WMMEDIASUBTYPE_MP3, 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0x #define O_TIMELENGTH DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH #define O_INCOMPLETE DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE +static REFERENCE_TIME samplelen(DWORD samples, int rate) +{ + return (REFERENCE_TIME) 10000000 * samples / rate; +} + struct test_buffer { IMediaBuffer IMediaBuffer_iface; BYTE data[5000]; @@ -149,10 +154,14 @@ static void test_convert(void) outbuf.maxlen = sizeof(outbuf.data); output.pBuffer = &outbuf.IMediaBuffer_iface; output.dwStatus = 0xdeadbeef; + output.rtTimestamp = 0xdeadbeef; + output.rtTimelength = 0xdeadbeef; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); ok(outbuf.len == 0, "got %u\n", outbuf.len); ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + ok(output.rtTimestamp == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); /* write several frames of mp3 data */ for (i = 0; i < 5; i++) @@ -170,6 +179,8 @@ static void test_convert(void) ok(hr == S_FALSE, "got %#x\n", hr); ok(outbuf.len == 0, "got %u\n", outbuf.len); ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + ok(output.rtTimestamp == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); /* implementations are inconsistent, but should write at least one frame of data */ outbuf.len = 0; @@ -178,14 +189,19 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); written = outbuf.len; ok(written > 1152 && written <= 5000, "got %u\n", written); -todo_wine ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), "got %#x\n", output.dwStatus); + ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == samplelen(written, 48000), + "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); ok(outbuf.len == written, "expected %u, got %u\n", written, outbuf.len); ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == samplelen(written, 48000), + "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); @@ -198,8 +214,11 @@ todo_wine ok(written + outbuf.len == (1152 * 5) || broken(written + outbuf.len == (1152 * 5) - 528), /* Win10 */ "got %u, total %u\n", outbuf.len, written + outbuf.len); -todo_wine ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#x\n", output.dwStatus); + ok(output.rtTimestamp == samplelen(written, 48000), + "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == samplelen(outbuf.len, 48000), + "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr);

1 0

Zebediah Figura : mp3dmod/tests: Add some tests for decoding.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: cae0e0b6e7863e60bcab5aa44b99ff9c6ea8e2db URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae0e0b6e7863e60bcab5aa4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 13 00:51:35 2018 -0500 mp3dmod/tests: Add some tests for decoding. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mp3dmod/tests/Makefile.in | 5 + dlls/mp3dmod/tests/mp3dmod.c | 233 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) diff --git a/configure b/configure index 5f33c04..ec15a90 100755 --- a/configure +++ b/configure @@ -18805,6 +18805,7 @@ wine_fn_config_makefile dlls/monodebg.vxd enable_win16 wine_fn_config_makefile dlls/mountmgr.sys enable_mountmgr_sys wine_fn_config_makefile dlls/mouse.drv16 enable_win16 wine_fn_config_makefile dlls/mp3dmod enable_mp3dmod +wine_fn_config_makefile dlls/mp3dmod/tests enable_tests wine_fn_config_makefile dlls/mpr enable_mpr wine_fn_config_makefile dlls/mpr/tests enable_tests wine_fn_config_makefile dlls/mprapi enable_mprapi diff --git a/configure.ac b/configure.ac index 5d60559..312c235 100644 --- a/configure.ac +++ b/configure.ac @@ -3401,6 +3401,7 @@ WINE_CONFIG_MAKEFILE(dlls/monodebg.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mountmgr.sys) WINE_CONFIG_MAKEFILE(dlls/mouse.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mp3dmod) +WINE_CONFIG_MAKEFILE(dlls/mp3dmod/tests) WINE_CONFIG_MAKEFILE(dlls/mpr) WINE_CONFIG_MAKEFILE(dlls/mpr/tests) WINE_CONFIG_MAKEFILE(dlls/mprapi) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in new file mode 100644 index 0000000..3cbe4fe --- /dev/null +++ b/dlls/mp3dmod/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mp3dmod.dll +IMPORTS = dmoguids ole32 strmiids uuid wmcodecdspuuid + +C_SRCS = \ + mp3dmod.c diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c new file mode 100644 index 0000000..e1c5f2b --- /dev/null +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -0,0 +1,233 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "windef.h" +#include "wingdi.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "mediaerr.h" +#include "wmcodecdsp.h" +#include "uuids.h" +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(WMMEDIASUBTYPE_MP3, 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +/* shorter aliases for flags */ +#define O_SYNCPOINT DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT +#define O_TIME DMO_OUTPUT_DATA_BUFFERF_TIME +#define O_TIMELENGTH DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH +#define O_INCOMPLETE DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE + +struct test_buffer { + IMediaBuffer IMediaBuffer_iface; + BYTE data[5000]; + DWORD len; + DWORD maxlen; +}; + +static inline struct test_buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct test_buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **obj) +{ + if (IsEqualIID(iid, &IID_IMediaBuffer) || IsEqualIID(iid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + ok(0, "Unexpected IID %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) +{ + return 2; +} + +static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) +{ + return 1; +} + +static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + This->len = len; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetMaxLength(IMediaBuffer *iface, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + *len = This->maxlen; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **buf, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + if (buf) *buf = This->data; + if (len) *len = This->len; + return S_OK; +} + +static IMediaBufferVtbl Buffer_vtbl = { + Buffer_QueryInterface, + Buffer_AddRef, + Buffer_Release, + Buffer_SetLength, + Buffer_GetMaxLength, + Buffer_GetBufferAndLength, +}; + +static void test_convert(void) +{ + static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; + struct test_buffer outbuf = {{&Buffer_vtbl}}; + struct test_buffer inbuf = {{&Buffer_vtbl}}; + DMO_MEDIA_TYPE in = {{0}}, out = {{0}}; + MPEGLAYER3WAVEFORMAT mp3fmt = {{0}}; + DMO_OUTPUT_DATA_BUFFER output; + WAVEFORMATEX wavfmt = {0}; + IMediaObject *dmo; + DWORD written; + DWORD status; + HRESULT hr; + int i; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "got %#x\n", hr); + + mp3fmt.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3fmt.wfx.nChannels = 2; + mp3fmt.wfx.nSamplesPerSec = 48000; + in.majortype = MEDIATYPE_Audio; + in.subtype = WMMEDIASUBTYPE_MP3; + in.formattype = FORMAT_WaveFormatEx; + in.cbFormat = sizeof(mp3fmt); + in.pbFormat = (BYTE *)&mp3fmt; + + hr = IMediaObject_SetInputType(dmo, 0, &in, 0); + ok(hr == S_OK, "got %#x\n", hr); + + wavfmt.wFormatTag = WAVE_FORMAT_PCM; + wavfmt.nChannels = 1; + wavfmt.nSamplesPerSec = 48000; + wavfmt.nAvgBytesPerSec = 48000 * ((1 * 8) / 8); + wavfmt.nBlockAlign = (1 * 8) / 8; + wavfmt.wBitsPerSample = 8; + out.majortype = MEDIATYPE_Audio; + out.subtype = MEDIASUBTYPE_PCM; + out.formattype = FORMAT_WaveFormatEx; + out.cbFormat = sizeof(wavfmt); + out.pbFormat = (BYTE *)&wavfmt; + + hr = IMediaObject_SetOutputType(dmo, 0, &out, 0); + ok(hr == S_OK, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = sizeof(outbuf.data); + output.pBuffer = &outbuf.IMediaBuffer_iface; + output.dwStatus = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + /* write several frames of mp3 data */ + for (i = 0; i < 5; i++) + memcpy(inbuf.data + 96 * i, mp3hdr, 4); + inbuf.len = 96 * 5; + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = 0; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + /* implementations are inconsistent, but should write at least one frame of data */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + written = outbuf.len; + ok(written > 1152 && written <= 5000, "got %u\n", written); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), + "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == written, "expected %u, got %u\n", written, outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + /* write the rest */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(written + outbuf.len == (1152 * 5) || + broken(written + outbuf.len == (1152 * 5) - 528), /* Win10 */ + "got %u, total %u\n", outbuf.len, written + outbuf.len); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + IMediaObject_Release(dmo); +} + +START_TEST(mp3dmod) +{ + IMediaObject *dmo; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_CMP3DecMediaObject not available\n"); + return; + } + IMediaObject_Release(dmo); + + test_convert(); + + CoUninitialize(); +}

1 0