February 2019 - Wine-Commits

Louis Lenders : ole32: Add CoEnableCallCancellation stub.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 8ab8030029ee5640b34d38a2d31bd1d4bf4ca21d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ab8030029ee5640b34d38a2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 28 09:05:37 2019 +0000 ole32: Add CoEnableCallCancellation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46732 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + include/objbase.h | 2 ++ 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index 954d6da..aea0fef 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -14,7 +14,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index a124d34..3cfdeda 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -14,7 +14,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index cffb33f..76bd665 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -85,7 +85,7 @@ @ stub CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject -@ stub CoEnableCallCancellation +@ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a28ff79..385a8df 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5198,6 +5198,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) } /*********************************************************************** + * CoEnableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoEnableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** * CoRegisterSurrogate [OLE32.@] */ HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d5a71b3..b2db3fd 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -16,6 +16,7 @@ @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall CoEnableCallCancellation(ptr) @ stdcall CoFileTimeNow(ptr) @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() diff --git a/include/objbase.h b/include/objbase.h index 875f0e1..8af7a80 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -350,6 +350,8 @@ HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult); HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv); HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases); BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk); +HRESULT WINAPI CoDisableCallCancellation(void *reserved); +HRESULT WINAPI CoEnableCallCancellation(void *reserved); /* security */ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3);

1 0

Louis Lenders : ole32: Add CoDisableCallCancellation stub.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 3f508e6edb640ed219e99b8ec4c8d9a5b4b8fe99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f508e6edb640ed219e99b8e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 28 09:05:38 2019 +0000 ole32: Add CoDisableCallCancellation stub. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 10 ++++++++++ dlls/ole32/ole32.spec | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index aea0fef..bc85dda 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -11,7 +11,7 @@ @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 3cfdeda..9a8f1da 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -11,7 +11,7 @@ @ stub CoCreateInstanceFromApp @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 76bd665..93575d5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -82,7 +82,7 @@ @ stub CoDeactivateObject @ stub CoDecodeProxy @ stub CoDecrementMTAUsage -@ stub CoDisableCallCancellation +@ stdcall CoDisableCallCancellation(ptr) ole32.CoDisableCallCancellation @ stub CoDisconnectContext @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 385a8df..fc93a2a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5198,6 +5198,16 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) } /*********************************************************************** + * CoDisableCallCancellation [OLE32.@] + */ +HRESULT WINAPI CoDisableCallCancellation(void *reserved) +{ + FIXME("(%p): stub\n", reserved); + + return E_NOTIMPL; +} + +/*********************************************************************** * CoEnableCallCancellation [OLE32.@] */ HRESULT WINAPI CoEnableCallCancellation(void *reserved) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b2db3fd..5e0e703 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -14,6 +14,7 @@ @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long) @ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime @ stdcall CoEnableCallCancellation(ptr)

1 0

Andrew Eikum : xaudio2: IXAPO::Process out parameter should not be const.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 53cd694e6a6b577635a3f524c7fc2bd0c1feaff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cd694e6a6b577635a3f524… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Feb 28 09:20:03 2019 -0600 xaudio2: IXAPO::Process out parameter should not be const. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapo.c | 2 +- include/xapo.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index ccad417..3ccb3f1 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -175,7 +175,7 @@ static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface) static void WINAPI XAPOFX_Process(IXAPO *iface, UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, UINT32 out_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) + XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) { XA2XAPOFXImpl *This = impl_from_IXAPO(iface); TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, diff --git a/include/xapo.idl b/include/xapo.idl index 9c3ad15..7b28ac9 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -118,7 +118,7 @@ interface IXAPO : IUnknown void UnlockForProcess(void); void Process(UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, + UINT32 out_params_count, XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled); UINT32 CalcInputFrames(UINT32 output_frames);

1 0

Józef Kucia : dxgi: Always use user images instead of using Vulkan swapchain directly.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 0da481856bd7e6b1dd877209c69bba6c5d107b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da481856bd7e6b1dd877209… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:55 2019 +0100 dxgi: Always use user images instead of using Vulkan swapchain directly. Some Vulkan drivers require that swapchain dimensions and window dimensions match exactly. Additionally, we want to have ability to change the presentation mode, and the only way to change the presentation mode in Vulkan is to recreate the swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07438f3..89bcf5d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1293,18 +1293,19 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - if (vk_swapchain_format != vk_format) + queue_desc = ID3D12CommandQueue_GetDesc(queue); + if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) { - queue_desc = ID3D12CommandQueue_GetDesc(queue); - if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) - { - /* vkCmdBlitImage() is only supported for Graphics queues. */ - FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); + /* vkCmdBlitImage() is only supported for graphics queues. */ + FIXME("Swapchain blit not implemented for command queue type %#x.\n", queue_desc.Type); + if (vk_swapchain_format != vk_format) return E_NOTIMPL; - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); + } + queue_family_index = vkd3d_get_vk_queue_family_index(queue); - TRACE("Creating user swapchain buffers for format conversion.\n"); + if (queue_desc.Type == D3D12_COMMAND_LIST_TYPE_DIRECT) + { + TRACE("Creating user swapchain buffers.\n"); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr;

1 0

Józef Kucia : dxgi: Recreate Vulkan swapchain only when current buffer index is 0.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 0510bca6964a103c5d38d1f5b5eb2a2a72d6a2b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0510bca6964a103c5d38d1f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:05:01 2019 +0100 dxgi: Recreate Vulkan swapchain only when current buffer index is 0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb55820..3c09516 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1989,6 +1989,16 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha if (swapchain->present_mode == present_mode) return S_OK; + /* + * We recreate the swapchain only when the current buffer index is 0, in order to preserve the + * expected back buffer index sequence. + */ + if (swapchain->current_buffer_index) + { + WARN("Skipping sync interval change, current buffer index %u.\n", swapchain->current_buffer_index); + return S_OK; + } + if (!swapchain->vk_images[swapchain->current_buffer_index]) { FIXME("Cannot recreate swapchain without user images.\n");

1 0

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 620.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 88aaee78fe96084f2d1ff5c224b04d10c459088e URL: https://source.winehq.org/git/wine.git/?a=commit;h=88aaee78fe96084f2d1ff5c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:39:42 2019 +0100 wined3d: Add GPU information for Intel HD Graphics 620. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0c70f04..a05f6cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -456,6 +456,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2b9b5f..1b70582 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2520,6 +2520,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630 = 0x5912, };

1 0

Alistair Leslie-Hughes : include: Add more DB_E_* defines.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: ca266d2e37cfe8cd750fedd19f6a7f5c60951c15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca266d2e37cfe8cd750fedd1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 08:16:02 2019 +0000 include: Add more DB_E_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledberr.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 8af38ef..61093ea 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -21,6 +21,14 @@ #ifndef __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H +#define DB_E_BADACCESSORHANDLE 0x80040e00 +#define DB_E_ROWLIMITEXCEEDED 0x80040e01 +#define DB_E_READONLYACCESSOR 0x80040e02 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_BADROWHANDLE 0x80040e04 +#define DB_E_OBJECTOPEN 0x80040e05 +#define DB_E_BADCHAPTER 0x80040e06 +#define DB_E_CANTCONVERTVALUE 0x80040e07 #define DB_E_BADBINDINFO 0x80040e08 #define DB_E_ERRORSINCOMMAND 0x80040e14

1 0

Zebediah Figura : quartz/tests: Add a test mp3 file.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 194f765ba58ee094dab3bc86654aa2b91fe75c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=194f765ba58ee094dab3bc86… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:13:01 2019 -0600 quartz/tests: Add a test mp3 file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 64 ++++++++++++++++++++++++---------------- dlls/quartz/tests/rsrc.rc | 6 ++++ dlls/quartz/tests/test.mp3 | Bin 0 -> 2349 bytes 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 897ba3a..88d964c 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -41,6 +41,7 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static WCHAR *load_resource(const WCHAR *name) { @@ -530,57 +531,63 @@ todo_wine IMediaFilter_Release(filter); } -static void rungraph(IFilterGraph2 *graph) +static void rungraph(IFilterGraph2 *graph, BOOL video) { - test_basic_video(graph); + if (video) + test_basic_video(graph); test_media_seeking(graph); test_state_change(graph); test_media_event(graph); } -static HRESULT test_graph_builder_connect_file(WCHAR *filename) +static HRESULT test_graph_builder_connect_file(WCHAR *filename, BOOL audio, BOOL video) { static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; - static const WCHAR inW[] = {'I','n',0}; - IBaseFilter *source_filter, *video_filter; + IBaseFilter *source_filter, *renderer; IPin *pin_in, *pin_out; IFilterGraph2 *graph; - IVideoWindow *window; + IEnumPins *enumpins; HRESULT hr; + if (video) + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&renderer); + else + hr = CoCreateInstance(&CLSID_AudioRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&renderer); + if (hr == VFW_E_NO_AUDIO_HARDWARE) + return VFW_E_CANNOT_CONNECT; + ok(hr == S_OK, "Got hr %#x.\n", hr); + graph = create_graph(); - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (void **)&window); - ok(hr == S_OK, "Failed to create VideoRenderer: %#x\n", hr); + IBaseFilter_EnumPins(renderer, &enumpins); + IEnumPins_Next(enumpins, 1, &pin_in, NULL); + IEnumPins_Release(enumpins); hr = IFilterGraph2_AddSourceFilter(graph, filename, NULL, &source_filter); ok(hr == S_OK, "AddSourceFilter failed: %#x\n", hr); - hr = IVideoWindow_QueryInterface(window, &IID_IBaseFilter, (void **)&video_filter); - ok(hr == S_OK, "QueryInterface(IBaseFilter) failed: %#x\n", hr); - hr = IFilterGraph2_AddFilter(graph, video_filter, NULL); + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); ok(hr == S_OK, "AddFilter failed: %#x\n", hr); hr = IBaseFilter_FindPin(source_filter, outputW, &pin_out); ok(hr == S_OK, "FindPin failed: %#x\n", hr); - hr = IBaseFilter_FindPin(video_filter, inW, &pin_in); - ok(hr == S_OK, "FindPin failed: %#x\n", hr); hr = IFilterGraph2_Connect(graph, pin_out, pin_in); if (SUCCEEDED(hr)) - rungraph(graph); + rungraph(graph, video); IPin_Release(pin_in); IPin_Release(pin_out); IBaseFilter_Release(source_filter); - IBaseFilter_Release(video_filter); - IVideoWindow_Release(window); + IBaseFilter_Release(renderer); IFilterGraph2_Release(graph); return hr; } -static void test_render_run(const WCHAR *file) +static void test_render_run(const WCHAR *file, BOOL audio, BOOL video) { IFilterGraph2 *graph; HANDLE h; @@ -608,19 +615,25 @@ static void test_render_run(const WCHAR *file) refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); - hr = test_graph_builder_connect_file(filename); + hr = test_graph_builder_connect_file(filename, audio, video); ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr); } else { - ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); - rungraph(graph); + if (audio) + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "Got hr %#x.\n", hr); + else + ok(hr == S_OK, "Got hr %#x.\n", hr); + rungraph(graph, video); refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); - hr = test_graph_builder_connect_file(filename); - ok(hr == S_OK || hr == VFW_S_PARTIAL_RENDER, "got %#x\n", hr); + hr = test_graph_builder_connect_file(filename, audio, video); + if (audio && video) + todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); + else + ok(hr == S_OK, "Got hr %#x.\n", hr); } /* check reference leaks */ @@ -737,7 +750,7 @@ todo_wine ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); if (SUCCEEDED(hr)) - rungraph(graph); + rungraph(graph, TRUE); return 0; } @@ -3199,8 +3212,9 @@ START_TEST(filtergraph) CoInitializeEx(NULL, COINIT_MULTITHREADED); test_interfaces(); - test_render_run(avifile); - test_render_run(mpegfile); + test_render_run(avifile, FALSE, TRUE); + test_render_run(mpegfile, TRUE, TRUE); + test_render_run(mp3file, TRUE, FALSE); test_enum_filters(); test_graph_builder_render(); test_graph_builder_connect(); diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 9bea5be..282cb1f 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -20,8 +20,14 @@ #include "windef.h" +/* ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi */ /* @makedep: test.avi */ test.avi RCDATA "test.avi" +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" + +/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/quartz/tests/test.mp3 b/dlls/quartz/tests/test.mp3 new file mode 100644 index 0000000..78d8dd2 Binary files /dev/null and b/dlls/quartz/tests/test.mp3 differ

1 0

Alexandre Julliard : winebuild: Make thiscall an entry point flag instead of a function type.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 28debd82fc90e551e8fa8fbee8858df237cb3301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28debd82fc90e551e8fa8fbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 17:09:51 2019 +0100 winebuild: Make thiscall an entry point flag instead of a function type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 2 -- tools/winebuild/parser.c | 40 +++++++++++++++++++++++++++------------- tools/winebuild/spec32.c | 12 +++++------- tools/winebuild/winebuild.man.in | 11 ++++++----- 5 files changed, 39 insertions(+), 28 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index fbc2cd9..15d22a0 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -47,7 +47,6 @@ typedef enum TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ - TYPE_THISCALL, /* thiscall function (Win32 on i386) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; @@ -173,6 +172,7 @@ struct strarray #define FLAG_REGISTER 0x10 /* use register calling convention */ #define FLAG_PRIVATE 0x20 /* function is private (cannot be imported) */ #define FLAG_ORDINAL 0x40 /* function should be imported by ordinal */ +#define FLAG_THISCALL 0x80 /* use thiscall calling convention */ #define FLAG_FORWARD 0x100 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5e5866c..893691e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -466,7 +466,6 @@ static void check_undefined_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_CDECL: case TYPE_VARARGS: - case TYPE_THISCALL: if (link_ext_symbols) { odp->flags |= FLAG_EXT_LINK; @@ -1444,7 +1443,6 @@ static void build_unix_import_lib( DLLSPEC *spec ) case TYPE_VARARGS: case TYPE_CDECL: case TYPE_STDCALL: - case TYPE_THISCALL: prefix = (!odp->name || (odp->flags & FLAG_ORDINAL)) ? import_ord_prefix : import_func_prefix; new_output_as_file( spec->file_name ); output( "\t.text\n" ); diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index ad99654..11b05aa 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -56,7 +56,6 @@ static const char * const TypeNames[TYPE_NBTYPES] = "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ - "thiscall", /* TYPE_THISCALL */ "extern" /* TYPE_EXTERN */ }; @@ -69,6 +68,7 @@ static const char * const FlagNames[] = "register", /* FLAG_REGISTER */ "private", /* FLAG_PRIVATE */ "ordinal", /* FLAG_ORDINAL */ + "thiscall", /* FLAG_THISCALL */ NULL }; @@ -287,10 +287,18 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) } odp->u.func.nb_args = i; - if (odp->type == TYPE_THISCALL && (!i || odp->u.func.args[0] != ARG_PTR)) + if (odp->flags & FLAG_THISCALL) { - error( "First argument of a thiscall function must be a pointer\n" ); - return 0; + if (odp->type != TYPE_STDCALL) + { + error( "A thiscall function must use the stdcall convention\n" ); + return 0; + } + if (!i || odp->u.func.args[0] != ARG_PTR) + { + error( "First argument of a thiscall function must be a pointer\n" ); + return 0; + } } return 1; } @@ -311,11 +319,6 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) error( "'stdcall' not supported for Win16\n" ); return 0; } - if (!is_win32 && odp->type == TYPE_THISCALL) - { - error( "'thiscall' not supported for Win16\n" ); - return 0; - } if (is_win32 && odp->type == TYPE_PASCAL) { error( "'pascal' not supported for Win32\n" ); @@ -327,6 +330,9 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) if (odp->type == TYPE_VARARGS) odp->flags |= FLAG_NORELAY; /* no relay debug possible for varags entry point */ + if (target_cpu != CPU_x86) + odp->flags &= ~FLAG_THISCALL; + if (!(token = GetToken(1))) { if (!strcmp( odp->name, "@" )) @@ -349,7 +355,7 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->flags |= FLAG_FORWARD; } } - if (target_cpu == CPU_x86 && odp->type == TYPE_THISCALL && !(odp->flags & FLAG_FORWARD)) + if ((odp->flags & FLAG_THISCALL) && !(odp->flags & FLAG_FORWARD)) { char *link_name = strmake( "__thiscall_%s", odp->link_name ); free( odp->link_name ); @@ -506,6 +512,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) error( "Flag '%s' is not supported in Win32\n", FlagNames[i] ); break; case FLAG_RET64: + case FLAG_THISCALL: if (spec->type == SPEC_WIN16) error( "Flag '%s' is not supported in Win16\n", FlagNames[i] ); break; @@ -538,8 +545,16 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) if (odp->type >= TYPE_NBTYPES) { - error( "Expected type after ordinal, found '%s' instead\n", token ); - goto error; + if (!strcmp( token, "thiscall" )) /* for backwards compatibility */ + { + odp->type = TYPE_STDCALL; + odp->flags |= FLAG_THISCALL; + } + else + { + error( "Expected type after ordinal, found '%s' instead\n", token ); + goto error; + } } if (!(token = GetToken(0))) goto error; @@ -571,7 +586,6 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_THISCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3552eca..1b4e534 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -58,7 +58,6 @@ static inline int needs_relay( const ORDDEF *odp ) { case TYPE_STDCALL: case TYPE_CDECL: - case TYPE_THISCALL: break; case TYPE_STUB: if (odp->u.func.nb_args != -1) break; @@ -129,7 +128,7 @@ static void get_arg_string( ORDDEF *odp, char str[MAX_ARGUMENTS + 1] ) break; } } - if (target_cpu == CPU_x86 && odp->type == TYPE_THISCALL) str[0] = 't'; + if (odp->flags & FLAG_THISCALL) str[0] = 't'; /* append return value */ if (get_ptr_size() == 4 && (odp->flags & FLAG_RET64)) @@ -225,7 +224,7 @@ static void output_relay_debug( DLLSPEC *spec ) switch (target_cpu) { case CPU_x86: - if (odp->type == TYPE_THISCALL) /* add the this pointer */ + if (odp->flags & FLAG_THISCALL) /* add the this pointer */ { output( "\tpopl %%eax\n" ); output( "\tpushl %%ecx\n" ); @@ -246,7 +245,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tcall *4(%%eax)\n" ); output_cfi( ".cfi_adjust_cfa_offset -8" ); - if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) + if (odp->type == TYPE_STDCALL) output( "\tret $%u\n", get_args_size( odp )); else output( "\tret\n" ); @@ -392,7 +391,6 @@ void output_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_THISCALL: if (odp->flags & FLAG_FORWARD) { output( "\t%s .L__wine_spec_forwards+%u\n", get_asm_ptr_keyword(), fwd_size ); @@ -953,7 +951,6 @@ void output_def_file( DLLSPEC *spec, int include_private ) /* fall through */ case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_THISCALL: /* try to reduce output */ if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); @@ -969,7 +966,8 @@ void output_def_file( DLLSPEC *spec, int include_private ) else if (strcmp(name, odp->link_name)) /* try to reduce output */ { output( "=%s", odp->link_name ); - if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & FLAG_THISCALL)) + output( "@%d", at_param ); } break; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 51ad544..4455e63 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -299,6 +299,12 @@ accessed through GetProcAddress. The entry point will be imported by ordinal instead of by name. The name is still exported. .TP +.B -thiscall +The function uses the +.I thiscall +calling convention (first parameter in %ecx register on i386). +.TP +.RE .BI -arch= cpu\fR[\fB,\fIcpu\fR] The entry point is only available on the specified CPU architecture(s). The names \fBwin32\fR and \fBwin64\fR match all @@ -335,11 +341,6 @@ for a Win16 or Win32 function using the C calling convention .B varargs for a Win16 or Win32 function using the C calling convention with a variable number of arguments -.TP -.B thiscall -for a Win32 function using the -.I thiscall -calling convention (first parameter in %ecx register on i386) .RE .PP .I args

1 0

Alexandre Julliard : ntdll: Support relay debugging of fastcall entry points.
by Alexandre Julliard Feb. 28, 2019

Feb. 28, 2019

Module: wine Branch: master Commit: 9c9efd706821b3e4ff3a4e3a473e1950d1fd4819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c9efd706821b3e4ff3a4e3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 17:12:15 2019 +0100 ntdll: Support relay debugging of fastcall entry points. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 4ebd1fd..a205086 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -371,7 +371,11 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi if (!is_ret_val( arg_types[i+1] )) TRACE( "," ); } *nb_args = pos; - if (arg_types[0] == 't') *nb_args |= 0x80000000; /* thiscall */ + if (arg_types[0] == 't') + { + *nb_args |= 0x80000000; /* thiscall/fastcall */ + if (arg_types[1] == 't') *nb_args |= 0x40000000; /* fastcall */ + } TRACE( ") ret=%08x\n", stack[-1] ); return entry_point->orig_func; } @@ -416,9 +420,8 @@ __ASM_GLOBAL_FUNC( relay_call, "pushl 8(%ebp)\n\t" "call " __ASM_NAME("relay_trace_entry") "\n\t" /* copy the arguments*/ - "movl -16(%ebp),%ecx\n\t" /* number of args */ + "movzwl -16(%ebp),%ecx\n\t" /* number of args */ "jecxz 1f\n\t" - "andl $0x7fffffff,%ecx\n\t" "leal 0(,%ecx,4),%edx\n\t" "subl %edx,%esp\n\t" "andl $~15,%esp\n\t" @@ -427,7 +430,10 @@ __ASM_GLOBAL_FUNC( relay_call, "rep; movsl\n\t" "testl $0x80000000,-16(%ebp)\n\t" /* thiscall */ "jz 1f\n\t" - "popl %ecx\n" + "popl %ecx\n\t" + "testl $0x40000000,-16(%ebp)\n\t" /* fastcall */ + "jz 1f\n\t" + "popl %edx\n" /* call the entry point */ "1:\tcall *%eax\n\t" "movl %eax,%esi\n\t"

1 0