wine-devel June 2020

wine-devel@winehq.org

75 participants
814 discussions

winevulkan DllMain() behavior
by Brendan Shanks 26 Jun '20

26 Jun '20

Hi all, On DLL_PROCESS_ATTACH, winevulkan’s DllMain() calls wine_vk_init(), which initializes the Vulkan driver and then returns whether that succeeded or failed. Now that winevulkan implements DllRegisterServer() (to create a JSON manifest and registry key to register with the official Vulkan loader), this has led to some undesirable behavior: - if the prefix is created in an environment where no Vulkan library is available (such as Proton’s build VM), DllMain() returns FALSE and the DLL registration fails. The manifest and registry key are not created, and if the official Vulkan loader is installed, Vulkan won't work until the prefix is updated (with Vulkan available). - on platforms (like older macOS) where Vulkan is available for 64-bit but not 32-bit, a “Failed to load Wine graphics driver supporting Vulkan” message is logged during prefix creation, which could be confusing for users. - prefix creation/update is unnecessarily slowed by having to load Vulkan. The fix I’m thinking of is that DllMain() shouldn’t call wine_vk_init(), and should always return TRUE. wine_vk_init() should be called (with an InitOnce) at the top of the five global Vulkan functions (vkGetInstanceProcAddr, vkEnumerateInstanceVersion, vkEnumerateInstanceExtensionProperties, vkEnumerateInstanceLayerProperties, vkCreateInstance), and also the two ICD entry points (vk_icdGetInstanceProcAddr, vk_icdNegotiateLoaderICDInterfaceVersion). All of those functions will need to correctly handle the case where wine_vk_init() has failed and vk_funcs is NULL. I think this behavior change will also match the official Vulkan loader better: on a Windows machine with no Vulkan hardware, vulkan-1.dll loads successfully, but vkCreateInstance() returns VK_ERROR_INITIALIZATION_FAILED. Any feedback or thoughts are appreciated. Thanks, Brendan

1 0

[PATCH v3 1/3] amstream: Use IDirectDraw instead of IDirectDraw7 internally.
by Gijs Vermeulen 25 Jun '20

25 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 35 ++++++++++++++++++---------------- dlls/amstream/tests/amstream.c | 12 ++++++------ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index ca6a910f3f..f1b6d37d08 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -39,7 +39,7 @@ struct ddraw_stream IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; - IDirectDraw7 *ddraw; + IDirectDraw *ddraw; CRITICAL_SECTION cs; IMediaStreamFilter *filter; @@ -107,17 +107,17 @@ static ULONG WINAPI ddraw_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("%p decreasing refcount to %u.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - if (This->ddraw) - IDirectDraw7_Release(This->ddraw); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + if (stream->ddraw) + IDirectDraw_Release(stream->ddraw); + HeapFree(GetProcessHeap(), 0, stream); } return ref; @@ -214,8 +214,8 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn stream->stream_type = stream_type; if (source_object - && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw7, (void **)&stream->ddraw))) - FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr); return S_OK; } @@ -373,23 +373,26 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMediaStream *iface, IDirectDraw **ddraw) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p)->(%p)\n", iface, ddraw); + TRACE("stream %p, ddraw %p.\n", stream, ddraw); if (!ddraw) return E_POINTER; *ddraw = NULL; - if (!This->ddraw) + if (!stream->ddraw) { - HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); + HRESULT hr = DirectDrawCreate(NULL, &stream->ddraw, NULL); if (FAILED(hr)) return hr; - IDirectDraw7_SetCooperativeLevel(This->ddraw, NULL, DDSCL_NORMAL); + IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL); } - return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); + IDirectDraw_AddRef(stream->ddraw); + *ddraw = stream->ddraw; + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 03c8660a42..5aedfa4680 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4776,7 +4776,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw7, &MSPID_PrimaryVideo, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 2); + EXPECT_REF(ddraw, 2); hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4787,19 +4787,19 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw2); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw2 == ddraw, "Expected ddraw %p, got %p.\n", ddraw, ddraw2); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ddraw3 == ddraw2, "Expected ddraw %p, got %p.\n", ddraw2, ddraw3); - todo_wine EXPECT_REF(ddraw, 4); + EXPECT_REF(ddraw, 4); IDirectDraw_Release(ddraw3); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); /* The current ddraw is released when SetDirectDraw() is called. */ hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, NULL); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - EXPECT_REF(ddraw, 2); + todo_wine EXPECT_REF(ddraw, 2); hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4808,7 +4808,7 @@ static void test_ddrawstream_getsetdirectdraw(void) hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine EXPECT_REF(ddraw, 3); + EXPECT_REF(ddraw, 3); if (hr == S_OK) { -- 2.27.0

4 6

[PATCH v2 1/3] quartz/videorenderer: Set the destination rect to the whole client area when connecting.
by Zebediah Figura 25 Jun '20

25 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 18 ++++++++++++++++++ dlls/quartz/videorenderer.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ab2b4f9e0d4..b157700a92b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2606,6 +2606,7 @@ static void test_basic_video(void) UINT count; ULONG ref; IPin *pin; + RECT rect; IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); IBaseFilter_FindPin(filter, L"In", &pin); @@ -2722,6 +2723,23 @@ static void test_basic_video(void) test_basic_video_source(video); test_basic_video_destination(video); + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + vih.bmiHeader.biWidth = 16; + vih.bmiHeader.biHeight = 16; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_source_position(video, 0, 0, 16, 16); + + SetRect(&rect, 0, 0, 0, 0); + AdjustWindowRectEx(&rect, WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW, FALSE, 0); + check_destination_position(video, 0, 0, max(16, GetSystemMetrics(SM_CXMIN) - (rect.right - rect.left)), + max(16, GetSystemMetrics(SM_CYMIN) - (rect.bottom - rect.top))); + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); IBasicVideo_Release(video); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e004d0fc214..f6eebc9ef9d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -225,12 +225,13 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_ filter->VideoWidth = bitmap_header->biWidth; filter->VideoHeight = abs(bitmap_header->biHeight); SetRect(&rect, 0, 0, filter->VideoWidth, filter->VideoHeight); - filter->window.src = filter->window.dst = rect; + filter->window.src = rect; AdjustWindowRectEx(&rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); SetWindowPos(window, NULL, 0, 0, rect.right - rect.left, rect.bottom - rect.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + GetClientRect(window, &filter->window.dst); return S_OK; } -- 2.27.0

2 3

[PATCH v2 9/9] server: Remove no longer needed support for opening current console in open_console request.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 15 ++------------- server/protocol.def | 3 +-- 2 files changed, 3 insertions(+), 15 deletions(-)

2 1

[PATCH 1/5] quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails.
by Zebediah Figura 25 Jun '20

25 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 8 ++------ dlls/quartz/tests/vmr9.c | 14 ++------------ dlls/quartz/vmr9.c | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1f0af817f0b..4422a1f9140 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1366,12 +1366,8 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = 16; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + vih.bmiHeader.biBitCount = 32; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); if (hr == VFW_E_TYPE_NOT_ACCEPTED) /* w7u */ diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index fae824b827d..69065d35761 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1618,20 +1618,10 @@ static void test_connect_pin(void) req_mt.subtype = MEDIASUBTYPE_RGB8; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_WAVE; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); - IFilterGraph2_Disconnect(graph, pin); - } + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); req_mt.subtype = MEDIASUBTYPE_RGB32; peer = (IPin *)0xdeadbeef; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 09d63b6a71c..e49266c30c2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -424,7 +424,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE default: FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); free(filter->surfaces); - return E_INVALIDARG; + return VFW_E_TYPE_NOT_ACCEPTED; } info.dwFlags = VMR9AllocFlag_TextureSurface; @@ -456,7 +456,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } free(filter->surfaces); - return hr; + return VFW_E_TYPE_NOT_ACCEPTED; } static void vmr_start_stream(struct strmbase_renderer *iface) -- 2.27.0

3 6

[PATCH v2 8/9] kernel32: Reimplement OpenConsoleW on top of CreateFileW.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-)

2 1

[PATCH 2/9] server: Introduce CurrentIn device.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 9 ++++++- server/file.h | 1 + 3 files changed, 69 insertions(+), 1 deletion(-)

2 2

[PATCH v2 7/9] kernelbase: Use NtCreateFile for console handles in CreateFileW.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 5 ----- dlls/kernelbase/console.c | 26 -------------------------- dlls/kernelbase/file.c | 31 ++++++------------------------- dlls/kernelbase/kernelbase.h | 2 -- 4 files changed, 6 insertions(+), 58 deletions(-)

1 0

[PATCH v2 6/9] ntdll: Support CONIN$ and CONOUT$ in RtlIsDosDeviceName_U.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/path.c | 8 ++++++++ dlls/ntdll/tests/path.c | 44 +++++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 8 deletions(-)

1 0

[PATCH v2 5/9] server: Support console global symlinks.
by Jacek Caban 25 Jun '20

25 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/directory.c | 22 ++++++++++++++++++++++ server/object.h | 3 +++ server/symlink.c | 26 ++++++++++---------------- 3 files changed, 35 insertions(+), 16 deletions(-)

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2020