- Wine-Devel - list.winehq.org

[PATCH 2/3] gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Jacek Caban Sept. 30, 2021

Sept. 30, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)

2 1

[PATCH 1/3] gdi32: Use native memory allocators in Unix library.
by Jacek Caban Sept. 30, 2021

Sept. 30, 2021

1 0

[PATCH] include: Add more sapi interfaces
by Alistair Leslie-Hughes Sept. 30, 2021

Sept. 30, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index d2c1aac8afc..ba577d4de04 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1065,6 +1065,31 @@ interface ISpVoice : ISpEventSource [in] ULONG count); }; +[ + object, + uuid(be7a9cc9-5f9e-11d2-960f-00c04f8ee628), + pointer_default(unique), + local, + restricted +] +interface ISpEventSink : IUnknown +{ + HRESULT AddEvents([in] const SPEVENT *events, [in] ULONG count); + HRESULT GetEventInterest([out] ULONGLONG *interest); +}; + +[ + object, + uuid(5b559f40-e952-11d2-bb91-00c04f8ee6c0), + pointer_default(unique), + restricted +] +interface ISpObjectWithToken : IUnknown +{ + HRESULT SetObjectToken([in] ISpObjectToken *token); + HRESULT GetObjectToken([out] ISpObjectToken **token); +}; + [ object, uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f), @@ -1097,6 +1122,21 @@ interface ISpAudio : ISpStreamFormat HRESULT GetBufferNotifySize([out] ULONG *size); HRESULT SetBufferNotifySize([in] ULONG size); }; +[ + object, + uuid(15806f6e-1d70-4b48-98e6-3b1a007509ab), + pointer_default(unique), + local, + restricted +] +interface ISpMMSysAudio : ISpAudio +{ + HRESULT GetDeviceId([out] UINT *id); + HRESULT SetDeviceId([in] UINT id); + HRESULT GetMMHandle([out] void **handle); + HRESULT GetLineId([out] UINT *id); + HRESULT SetLineId([in] UINT id); +}; [ object, @@ -1254,4 +1294,26 @@ library SpeechLib interface ISpStream; [default] interface ISpeechFileStream; }; + + [ + uuid(cf3d2e50-53f2-11d2-960c-00c04f8ee628) + ] + coclass SpMMAudioIn + { + interface ISpEventSource; + interface ISpEventSink; + interface ISpObjectWithToken; + interface ISpMMSysAudio; + }; + + [ + uuid(a8c680eb-3d32-11d2-9ee7-00c04f797396) + ] + coclass SpMMAudioOut + { + interface ISpEventSource; + interface ISpEventSink; + interface ISpObjectWithToken; + interface ISpMMSysAudio; + }; } -- 2.33.0

1 0

[PATCH 01/11] dinput8/tests: Don't try running more tests after a win_skip.
by Rémi Bernon Sept. 30, 2021

Sept. 30, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ce2a3792593..533c4a8ca42 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4593,7 +4593,7 @@ struct device_desc HIDP_CAPS hid_caps; }; -static void test_device_types( void ) +static BOOL test_device_types(void) { #include "psh_hid_macros.h" static const unsigned char unknown_desc[] = @@ -4837,11 +4837,12 @@ static void test_device_types( void ) DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; IDirectInputDevice8W *device; + BOOL success = TRUE; IDirectInput8W *di; ULONG i, ref; HRESULT hr; - for (i = 0; i < ARRAY_SIZE(device_desc); ++i) + for (i = 0; i < ARRAY_SIZE(device_desc) && success; ++i) { winetest_push_context( "desc[%d]", i ); GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -4852,7 +4853,7 @@ static void test_device_types( void ) if (!dinput_driver_start( device_desc[i].report_desc_buf, device_desc[i].report_desc_len, &device_desc[i].hid_caps )) { - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4860,7 +4861,7 @@ static void test_device_types( void ) if (FAILED(hr)) { win_skip( "DirectInput8Create returned %#x\n", hr ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4870,7 +4871,7 @@ static void test_device_types( void ) { win_skip( "device not found, skipping tests\n" ); IDirectInput8_Release( di ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4918,6 +4919,8 @@ static void test_device_types( void ) SetCurrentDirectoryW( cwd ); winetest_pop_context(); } + + return success; } static void test_force_feedback_joystick( void ) @@ -5345,9 +5348,11 @@ START_TEST( hid ) test_hid_driver( 1, TRUE ); CoInitialize( NULL ); - test_device_types(); - test_simple_joystick(); - test_force_feedback_joystick(); + if (test_device_types()) + { + test_simple_joystick(); + test_force_feedback_joystick(); + } CoUninitialize(); UnmapViewOfFile( test_data ); -- 2.33.0

1 10

[PATCH 1/5] ole32/composite: Fix argument handling in component enumerator methods.
by Nikolay Sivov Sept. 30, 2021

Sept. 30, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compositemoniker.c | 60 ++++++----- dlls/ole32/tests/moniker.c | 192 +++++++++++++++++++++++++++++++--- 2 files changed, 209 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 80a1a675766..e5437c8880f 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -495,7 +495,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker *iface, BOOL forward, I TRACE("%p, %d, %p\n", iface, forward, ppenumMoniker); if (!ppenumMoniker) - return E_POINTER; + return E_INVALIDARG; if (FAILED(hr = composite_get_components_alloc(moniker, &monikers))) return hr; @@ -1346,44 +1346,45 @@ EnumMonikerImpl_Release(IEnumMoniker* iface) return ref; } -/****************************************************************************** - * EnumMonikerImpl_Next - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Next(IEnumMoniker* iface,ULONG celt, IMoniker** rgelt, - ULONG* pceltFethed) +static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count, + IMoniker **m, ULONG *fetched) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG i; + TRACE("%p, %u, %p, %p.\n", iface, count, m, fetched); + + if (!m) + return E_INVALIDARG; + + *m = NULL; + /* retrieve the requested number of moniker from the current position */ - for(i=0;((This->currentPos < This->tabSize) && (i < celt));i++) + for(i=0;((This->currentPos < This->tabSize) && (i < count));i++) { - rgelt[i]=This->tabMoniker[This->currentPos++]; - IMoniker_AddRef(rgelt[i]); + m[i] = This->tabMoniker[This->currentPos++]; + IMoniker_AddRef(m[i]); } - if (pceltFethed!=NULL) - *pceltFethed= i; + if (fetched) + *fetched = i; - if (i==celt) - return S_OK; - else - return S_FALSE; + return i == count ? S_OK : S_FALSE; } -/****************************************************************************** - * EnumMonikerImpl_Skip - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Skip(IEnumMoniker* iface,ULONG celt) +static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker *iface, ULONG count) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - if ((This->currentPos+celt) >= This->tabSize) + TRACE("%p, %u.\n", iface, count); + + if (!count) + return S_OK; + + if ((This->currentPos + count) >= This->tabSize) return S_FALSE; - This->currentPos+=celt; + This->currentPos += count; return S_OK; } @@ -1401,15 +1402,16 @@ EnumMonikerImpl_Reset(IEnumMoniker* iface) return S_OK; } -/****************************************************************************** - * EnumMonikerImpl_Clone - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Clone(IEnumMoniker* iface,IEnumMoniker** ppenum) +static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker *iface, IEnumMoniker **ret) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ppenum); + TRACE("%p, %p.\n", iface, ret); + + if (!ret) + return E_INVALIDARG; + + return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ret); } static const IEnumMonikerVtbl VT_EnumMonikerImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7e4a42a0ee6..ed2accff6a9 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3163,8 +3163,8 @@ static void test_generic_composite_moniker(void) { "CI1I3", "CA1I2", MKSYS_GENERICCOMPOSITE, L"!I1!I2" }, }; IMoniker *moniker, *inverse, *moniker1, *moniker2, *moniker3, *moniker4; + IEnumMoniker *enummoniker, *enummoniker2; struct test_moniker *m, *m2; - IEnumMoniker *enummoniker; IRunningObjectTable *rot; DWORD hash, cookie; HRESULT hr; @@ -3293,19 +3293,6 @@ todo_wine TEST_MONIKER_TYPE(inverse, MKSYS_GENERICCOMPOSITE); IMoniker_Release(inverse); - /* Enum() */ - hr = IMoniker_Enum(moniker, TRUE, &enummoniker); - ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); - IEnumMoniker_Release(enummoniker); - - hr = IMoniker_Enum(moniker, FALSE, &enummoniker); - ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); - IEnumMoniker_Release(enummoniker); - - hr = IMoniker_Enum(moniker, FALSE, NULL); -todo_wine - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - /* BindToObject() */ hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3646,6 +3633,183 @@ todo_wine { IMoniker_Release(moniker); + /* Enum() */ + hr = create_moniker_from_desc("CI1CI2I3", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Enum(moniker, FALSE, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Forward direction */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Next(enummoniker, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + + len = 1; + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + ok(!moniker2, "Unexpected pointer.\n"); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I1"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I2"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I3"); + IMoniker_Release(moniker2); + + len = 1; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 1); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Clone(enummoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + hr = IEnumMoniker_Reset(enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I3"); + IMoniker_Release(moniker2); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + IEnumMoniker_Release(enummoniker); + + /* Backward direction */ + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + + hr = IEnumMoniker_Next(enummoniker, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + + len = 1; + moniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Next(enummoniker, 0, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + ok(!moniker2, "Unexpected pointer.\n"); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I3"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I2"); + IMoniker_Release(moniker2); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I1"); + IMoniker_Release(moniker2); + + len = 1; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected count %u.\n", len); + + hr = IEnumMoniker_Skip(enummoniker, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 1); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Clone(enummoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + hr = IEnumMoniker_Reset(enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IEnumMoniker_Skip(enummoniker, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + len = 0; + hr = IEnumMoniker_Next(enummoniker, 1, &moniker2, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(len == 1, "Unexpected count %u.\n", len); + TEST_DISPLAY_NAME(moniker2, L"!I1"); + IMoniker_Release(moniker2); + + enummoniker2 = (void *)0xdeadbeef; + hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker2, "Unexpected pointer.\n"); +} + IEnumMoniker_Release(enummoniker); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); } -- 2.33.0

1 4

[PATCH v2] riched20: Fix saving to disk first-indent and left-indent (\fi and \li)
by Philip Hardin Sept. 30, 2021

Sept. 30, 2021

Signed-off-by: Philip Hardin <phoss(a)tutanota.com> --- dlls/riched20/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 7c7e648f107..2477dda7407 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -662,10 +662,12 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */ fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { - if (fmt->dxOffset) - sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); - if (fmt->dxStartIndent) - sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); + int first_indent = -fmt->dxOffset; + int left_indent = fmt->dxStartIndent + fmt->dxOffset; + if (first_indent) + sprintf(props + strlen(props), "\\fi%d", first_indent); + if (left_indent) + sprintf(props + strlen(props), "\\li%d", left_indent); if (fmt->dxRightIndent) sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { -- 2.25.1

2 1

[PATCH vkd3d v2] vkd3d: Only disable raster based on SO stream if SO is used.
by Conor McCarthy Sept. 30, 2021

Sept. 30, 2021

Fixes the black screen problem in Diablo 2: Resurrected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51105 From: Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Remove spurious FIXME_ONCE change (my bad). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e554b44..73c78d06 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2629,7 +2629,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) - || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + || (so_desc->NumEntries != 0 && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info); -- 2.32.0

1 0

[PATCH vkd3d] vkd3d: Only disable raster based on SO stream if SO is used.
by Conor McCarthy Sept. 30, 2021

Sept. 30, 2021

Fixes the black screen problem in Diablo 2: Resurrected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51105 From: Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f4a4149..186e4370 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6065,7 +6065,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if } else { - FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64 + FIXME_ONCE("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64 ", completed value %#"PRIx64".\n", fence, value, completed_value); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e554b44..73c78d06 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2629,7 +2629,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) - || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + || (so_desc->NumEntries != 0 && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info); -- 2.32.0

1 0

[PATCH 1/3] krnl386: Call DOSVM_IntProcRelay() via the application stack.
by Zebediah Figura Sept. 30, 2021

Sept. 30, 2021

Instead of using a dedicated stack. The dedicated stack was introduced by 9d7ff6c85b0827b7f54989050b4c34f1f459e94d, in order to support potentially nested DPMI interrupts. DPMI support was removed by ed6bdb3c51cd4b8c94f9839806321703e7aa9765; hence there is no longer a reason to account for nested interrupts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/krnl386.exe16/dosexe.h | 2 - dlls/krnl386.exe16/dosmem.c | 8 -- dlls/krnl386.exe16/interrupts.c | 9 +-- dlls/krnl386.exe16/relay.c | 132 +------------------------------- 4 files changed, 3 insertions(+), 148 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index c4c8def5dce..42b8e0f4437 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -41,7 +41,6 @@ typedef void (WINAPI *INTPROC)(CONTEXT*); extern WORD DOSVM_psp DECLSPEC_HIDDEN; /* psp of current DOS task */ extern WORD int16_sel DECLSPEC_HIDDEN; extern WORD relay_code_sel DECLSPEC_HIDDEN; -extern WORD relay_data_sel DECLSPEC_HIDDEN; #define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val))) @@ -247,7 +246,6 @@ extern DWORD DOSVM_inport( int port, int size ) DECLSPEC_HIDDEN; extern void DOSVM_outport( int port, int size, DWORD value ) DECLSPEC_HIDDEN; /* relay.c */ -void DOSVM_RelayHandler( CONTEXT * ) DECLSPEC_HIDDEN; void DOSVM_BuildCallFrame( CONTEXT *, DOSRELAY, LPVOID ) DECLSPEC_HIDDEN; #endif /* __WINE_DOSEXE_H */ diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index 36b02aec484..2d55eb050de 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -45,7 +45,6 @@ WORD DOSMEM_BiosSysSeg; /* BIOS ROM segment at 0xf000:0 */ WORD DOSVM_psp = 0; WORD int16_sel = 0; WORD relay_code_sel = 0; -WORD relay_data_sel = 0; /* DOS memory highest address (including HMA) */ #define DOSMEM_SIZE 0x110000 @@ -306,7 +305,6 @@ static void DOSMEM_InitSegments(void) static const char relay[]= { 0xca, 0x04, 0x00, /* 16-bit far return and pop 4 bytes (relay void* arg) */ - 0xcd, 0x31, /* int 31 */ }; /* @@ -330,17 +328,11 @@ static void DOSMEM_InitSegments(void) /* * PM / offset 0: Stub where __wine_call_from_16_regs returns. - * PM / offset 3: Stub which swaps back to 32-bit application code/stack. */ relay_code_sel = GLOBAL_Alloc( GMEM_FIXED, sizeof(relay), 0, LDT_FLAGS_CODE ); ptr = GlobalLock16( relay_code_sel ); memcpy( ptr, relay, sizeof(relay) ); GlobalUnlock16( relay_code_sel ); - - /* - * Space for 16-bit stack used by relay code. - */ - relay_data_sel = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, DOSVM_RELAY_DATA_SIZE ); } /****************************************************************** diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index e2a129e4a20..d397d20072d 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -250,14 +250,7 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) DOSMEM_InitDosMemory(); - if (context->SegCs == relay_code_sel) - { - /* - * This must not be called using DOSVM_BuildCallFrame. - */ - DOSVM_RelayHandler( context ); - } - else if (context->SegCs == int16_sel) + if (context->SegCs == int16_sel) { /* Restore original flags stored into the stack by the caller. */ WORD *stack = CTX_SEG_OFF_TO_LIN(context, diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 3559bb460a7..116198e5ddb 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -34,26 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -/* - * Magic DWORD used to check stack integrity. - */ -#define RELAY_MAGIC 0xabcdef00 - -/* - * Memory block for temporary 16-bit stacks used with relay calls. - */ -typedef struct { - DWORD inuse; /* non-zero if stack block is in use */ - DWORD eip; /* saved ip */ - DWORD seg_cs; /* saved cs */ - DWORD esp; /* saved sp */ - DWORD seg_ss; /* saved ss */ - DWORD stack_bottom; /* guard dword */ - BYTE stack[256-7*4]; /* 16-bit stack */ - DWORD stack_top; /* guard dword */ -} RELAY_Stack16; - - static const char **debug_relay_excludelist; static const char **debug_relay_includelist; static const char **debug_snoop_excludelist; @@ -572,58 +552,6 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte return ret_val; } -/********************************************************************** - * RELAY_GetPointer - * - * Get pointer to stack block when given esp pointing to 16-bit stack - * inside relay data segment. - */ -static RELAY_Stack16 *RELAY_GetPointer( DWORD offset ) -{ - offset = offset / sizeof(RELAY_Stack16) * sizeof(RELAY_Stack16); - return MapSL(MAKESEGPTR(relay_data_sel, offset)); -} - - -/********************************************************************** - * RELAY_MakeShortContext - * - * Allocate separate 16-bit stack, make stack pointer point to this - * stack and make code pointer point to stub that restores everything. - * So, after this routine, SS and CS are guaranteed to be 16-bit. - * - * Note: This might be called from signal handler, so the stack - * allocation algorithm must be signal safe. - */ -static void RELAY_MakeShortContext( CONTEXT *context ) -{ - DWORD offset = offsetof(RELAY_Stack16, stack_top); - RELAY_Stack16 *stack = RELAY_GetPointer( 0 ); - - while (stack->inuse && offset < DOSVM_RELAY_DATA_SIZE) { - stack++; - offset += sizeof(RELAY_Stack16); - } - - if (offset >= DOSVM_RELAY_DATA_SIZE) - ERR( "Too many nested interrupts!\n" ); - - stack->inuse = 1; - stack->eip = context->Eip; - stack->seg_cs = context->SegCs; - stack->esp = context->Esp; - stack->seg_ss = context->SegSs; - - stack->stack_bottom = RELAY_MAGIC; - stack->stack_top = RELAY_MAGIC; - - context->SegSs = relay_data_sel; - context->Esp = offset; - context->SegCs = relay_code_sel; - context->Eip = 3; -} - - /********************************************************************** * RELAY_RelayStub * @@ -632,58 +560,9 @@ static void RELAY_MakeShortContext( CONTEXT *context ) */ static void __stdcall RELAY_RelayStub( DOSRELAY proc, unsigned char *args, CONTEXT *context ) { - if (proc) - { - RELAY_Stack16 *stack = RELAY_GetPointer( context->Esp ); - - DWORD old_seg_cs = context->SegCs; - DWORD old_eip = context->Eip; - DWORD old_seg_ss = context->SegSs; - DWORD old_esp = context->Esp; - - context->SegCs = stack->seg_cs; - context->Eip = stack->eip; - context->SegSs = stack->seg_ss; - context->Esp = stack->esp; - - proc( context, *(LPVOID *)args ); - - stack->seg_cs = context->SegCs; - stack->eip = context->Eip; - stack->seg_ss = context->SegSs; - stack->esp = context->Esp; - - context->SegCs = old_seg_cs; - context->Eip = old_eip; - context->SegSs = old_seg_ss; - context->Esp = old_esp; - } + proc( context, *(LPVOID *)args ); } - -/********************************************************************** - * DOSVM_RelayHandler - * - * Restore saved code and stack pointers and release stack block. - */ -void DOSVM_RelayHandler( CONTEXT *context ) -{ - RELAY_Stack16 *stack = RELAY_GetPointer( context->Esp ); - - context->SegSs = stack->seg_ss; - context->Esp = stack->esp; - context->SegCs = stack->seg_cs; - context->Eip = stack->eip; - - if (!stack->inuse || - stack->stack_bottom != RELAY_MAGIC || - stack->stack_top != RELAY_MAGIC) - ERR( "Stack corrupted!\n" ); - - stack->inuse = 0; -} - - /********************************************************************** * DOSVM_BuildCallFrame * @@ -692,13 +571,6 @@ void DOSVM_RelayHandler( CONTEXT *context ) */ void DOSVM_BuildCallFrame( CONTEXT *context, DOSRELAY relay, LPVOID data ) { - WORD code_sel = relay_code_sel; - - /* - * Allocate separate stack for relay call. - */ - RELAY_MakeShortContext( context ); - /* * Build call frame. */ @@ -713,7 +585,7 @@ void DOSVM_BuildCallFrame( CONTEXT *context, DOSRELAY relay, LPVOID data ) PUSH_WORD16( context, HIWORD(RELAY_RelayStub) ); /* STACK16FRAME.relay.hiword */ PUSH_WORD16( context, LOWORD(RELAY_RelayStub) ); /* STACK16FRAME.relay.loword */ PUSH_WORD16( context, 0 ); /* STACK16FRAME.module_cs.hiword */ - PUSH_WORD16( context, code_sel ); /* STACK16FRAME.module_cs.loword */ + PUSH_WORD16( context, relay_code_sel ); /* STACK16FRAME.module_cs.loword */ PUSH_WORD16( context, 0 ); /* STACK16FRAME.callfrom_ip.hiword */ PUSH_WORD16( context, 0 ); /* STACK16FRAME.callfrom_ip.loword */ -- 2.33.0

4 6

[PATCH v6 1/5] winegstreamer: Factor out more of the init_gst callback into wg_parser_connect().
by Zebediah Figura Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 78 +++++++++++----------------------- 1 file changed, 24 insertions(+), 54 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 169f223c5a5..68e453e9944 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1494,6 +1494,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); unsigned int i; + int ret; parser->file_size = file_size; parser->sink_connected = true; @@ -1516,12 +1517,29 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->start_offset = parser->next_offset = parser->stop_offset = 0; parser->next_pull_offset = 0; + parser->error = false; if (!parser->init_gst(parser)) return E_FAIL; + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); + if (ret == GST_STATE_CHANGE_FAILURE) + { + GST_ERROR("Failed to play stream.\n"); + return E_FAIL; + } + pthread_mutex_lock(&parser->mutex); + while (!parser->no_more_pads && !parser->error) + pthread_cond_wait(&parser->init_cond, &parser->mutex); + if (parser->error) + { + pthread_mutex_unlock(&parser->mutex); + return E_FAIL; + } + for (i = 0; i < parser->stream_count; ++i) { struct wg_parser_stream *stream = parser->streams[i]; @@ -1677,7 +1695,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = parser->error = false; + parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1686,24 +1704,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) return FALSE; } - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } - - pthread_mutex_lock(&parser->mutex); - while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); - return TRUE; } @@ -1724,7 +1724,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&parser->mutex); - parser->no_more_pads = parser->error = false; + parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1733,24 +1733,6 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) return FALSE; } - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } - - pthread_mutex_lock(&parser->mutex); - while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &parser->mutex); - if (parser->error) - { - pthread_mutex_unlock(&parser->mutex); - return FALSE; - } - pthread_mutex_unlock(&parser->mutex); - return TRUE; } @@ -1781,15 +1763,9 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } - gst_pad_set_active(stream->my_sink, 1); - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } + + parser->no_more_pads = true; return TRUE; } @@ -1821,15 +1797,9 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } - gst_pad_set_active(stream->my_sink, 1); - gst_element_set_state(parser->container, GST_STATE_PAUSED); - ret = gst_element_get_state(parser->container, NULL, NULL, -1); - if (ret == GST_STATE_CHANGE_FAILURE) - { - GST_ERROR("Failed to play stream.\n"); - return FALSE; - } + + parser->no_more_pads = true; return TRUE; } -- 2.33.0

4 17