March 2020 - Wine-devel - list.winehq.org

[PATCH] winemac: Fix macdrv_WindowPosChanged behavior when SWP_HIDEWINDOW flag is used.
by Piotr Caban 11 Mar '20

11 Mar '20

In this case surface points to dummy surface or NULL. Later e.g. set_window_surface assumes that it was created by Mac driver. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winemac.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 4

[PATCH 0/8] Wine D3D window decoration changes.
by Rémi Bernon 11 Mar '20

11 Mar '20

This is a different workaround that gives the same results both on Windows and on Wine. It intercepts WM_NCCALCSIZE message to request empty non-client area when a window is fullscreen, which makes the client area cover the whole window, regardless of the decorations. We could also check whether the application changed the default non-client area dimensions before overriding it. However, as OpenGL or Vulkan aren't able to render over non-client areas anyway, I believe it is fine to override it when Wine D3D is supposed to render fullscreen. Rémi Bernon (8): dxgi/tests: Add more complete window style checks. wined3d: Override WM_NCCALCSIZE for fullscreen windows. wined3d: Add WINED3D_SWAPCHAIN_NO_STYLE_CHANGES flag. d3d8: Do not modify window styles anymore. d3d9: Do not modify window styles anymore. ddraw: Do not modify window styles anymore. wined3d: Use the same style changes as native DXGI. wined3d: Always restore styles if changes are allowed. dlls/d3d8/device.c | 3 +- dlls/d3d8/tests/device.c | 10 ++--- dlls/d3d9/device.c | 3 +- dlls/d3d9/tests/d3d9ex.c | 14 ++++--- dlls/d3d9/tests/device.c | 14 ++++--- dlls/ddraw/ddraw.c | 3 +- dlls/ddraw/tests/ddraw1.c | 8 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++-- dlls/ddraw/tests/ddraw4.c | 8 ++-- dlls/ddraw/tests/ddraw7.c | 8 ++-- dlls/dxgi/tests/dxgi.c | 79 ++++++++++++++++++++++++++++++++++----- dlls/wined3d/device.c | 26 +++++++++++++ dlls/wined3d/swapchain.c | 68 ++++++++++----------------------- include/wine/wined3d.h | 1 + 14 files changed, 161 insertions(+), 92 deletions(-) -- 2.25.0

2 11

[PATCH v2] winemac: Handle dummy_surface in get_mac_surface.
by Piotr Caban 11 Mar '20

11 Mar '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winemac.drv/surface.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

2 1

[PATCH v2 1/5] ntdll/tests: Add tests for linking a file to the same name.
by Zebediah Figura 11 Mar '20

11 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e0d4580ae04..9e54cf044d7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2759,6 +2759,36 @@ static void test_file_link_information(void) HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); delete_object( newpath ); + + /* oldpath == newpath */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + pRtlDosPathNameToNtPathName_U( oldpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fli->ReplaceIfExists = FALSE; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res ); + + fli->ReplaceIfExists = TRUE; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); } static void test_file_both_information(void) -- 2.25.1

2 5

[PATCH 1/7] mf: Shutdown samplegrabber event queue on sink shutdown.
by Nikolay Sivov 11 Mar '20

11 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 6 +++--- dlls/mf/tests/mf.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f44df9f32b..f4dbe4f283 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -849,10 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) - { - IMFMediaEventQueue_Shutdown(grabber->event_queue); IMFMediaEventQueue_Release(grabber->event_queue); - } if (grabber->clock) IMFPresentationClock_Release(grabber->clock); if (grabber->timer) @@ -1045,12 +1042,15 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) grabber->is_shut_down = TRUE; if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { + /* Detach stream. */ IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; + + IMFMediaEventQueue_Shutdown(grabber->event_queue); } LeaveCriticalSection(&grabber->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index da533d05d3..ebab86aab6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1925,6 +1925,7 @@ static void test_sample_grabber(void) IMFMediaSink *sink, *sink2; DWORD flags, count, id; IMFActivate *activate; + IMFMediaEvent *event; ULONG refcount; IUnknown *unk; HRESULT hr; @@ -1995,9 +1996,12 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IMFClockStateSink_Release(clocksink); + /* Event generator. */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IMFMediaEventGenerator_Release(eg); + + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); @@ -2130,9 +2134,18 @@ todo_wine hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -2148,6 +2161,10 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); +todo_wine + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaSink(stream, &sink2); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); @@ -2195,6 +2212,7 @@ todo_wine hr = IMFStreamSink_GetMediaTypeHandler(stream, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFMediaEventGenerator_Release(eg); IMFMediaSink_Release(sink); IMFStreamSink_Release(stream); -- 2.25.1

2 12

[PATCH] tools: Remove 0x0501 API versions forced by winapi_test.
by Serge Gautherie 11 Mar '20

11 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/gdi32/tests/generated.c | 4 ---- dlls/kernel32/tests/generated.c | 4 ---- dlls/ntdll/tests/generated.c | 4 ---- dlls/rpcrt4/tests/generated.c | 4 ---- dlls/shell32/tests/generated.c | 4 ---- dlls/shlwapi/tests/generated.c | 4 ---- dlls/urlmon/tests/generated.c | 4 ---- dlls/user32/tests/generated.c | 4 ---- dlls/wininet/tests/generated.c | 4 ---- dlls/winmm/tests/generated.c | 4 ---- tools/winapi/winapi_test | 4 ---- 11 files changed, 44 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 019524d..fe3ecd9 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index a166d97..7c57fea 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index b099a5c..d277e02 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "ntdll_test.h" diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 7eb8faa..72672cd 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index ace877e..55f4eab 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index e5e0896..3a8e426 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 63e892b..45fd5d8 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 2107a44..be1b698 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 1282b6f..f88834a 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ec25e07..4c0fe7a 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windef.h" diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 92f4ae3..48c29f8 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -503,10 +503,6 @@ sub output_header($$$) { print OUT " */\n"; print OUT "\n"; - print OUT "#define WINVER 0x0501\n"; - print OUT "#define _WIN32_IE 0x0501\n"; - print OUT "#define _WIN32_WINNT 0x0501\n"; - print OUT "\n"; print OUT "#define WINE_NOWINSOCK\n"; print OUT "\n"; foreach my $test (@tests) { -- 2.10.0.windows.1

1 0

[PATCH] winemac.drv: Always call NSOpenGLContext::update from the main thread.
by Sven Baars 11 Mar '20

11 Mar '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- This stops World of Tanks from hanging on Catalina. It is similar to 1261589c2cc68061d4bd9d41a387cd4979d7073c. dlls/winemac.drv/cocoa_opengl.m | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index e60b0b388b8..6001b01be01 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -360,7 +360,13 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) context.view = view; } else - [context update]; + { + if ([NSThread isMainThread]) + [context update]; + else OnMainThread(^{ + [context update]; + }); + } [context resetSurfaceIfBackingSizeChanged]; } } -- 2.25.0

1 0

[PATCH] services: Initialize OVERLAPPED Offset and OffsetHigh to 0.
by Jefferson Carpenter 11 Mar '20

11 Mar '20

Submitting the patch from this bug: https://bugs.winehq.org/show_bug.cgi?id=48735 thanks, Jefferson

2 1

[PATCH 5/5] wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch().
by Zhiyi Zhang 11 Mar '20

11 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/directx.c | 12 +++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7c13d4abd4b..e82f9644e3b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1913,7 +1913,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c wined3d_mutex_unlock(); return hr; } - framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d_adapter, mode.format_id, mode.width); framebuffer_size *= mode.height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 627963232e4..85c1ef4966b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6265,7 +6265,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) { WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); @@ -6282,7 +6282,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDPARAMS; } - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) { WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d026c6a49ef..8f8933801a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1738,19 +1738,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3D_OK; } -UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width) +unsigned int CDECL wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width) { - const struct wined3d_adapter *adapter; unsigned int row_pitch, slice_pitch; - TRACE("wined3d %p, adapter_idx %u, format_id %s, width %u.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), width); + TRACE("adapter %p, format_id %s, width %u.\n", adapter, debug_d3dformat(format_id), width); - if (adapter_idx >= wined3d->adapter_count) - return ~0u; - - adapter = wined3d->adapters[adapter_idx]; wined3d_format_calculate_pitch(wined3d_get_format(adapter, format_id, 0), 1, width, 1, &row_pitch, &slice_pitch); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3e511c6c2e1..a25accc2371 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,7 +1,7 @@ @ stdcall wined3d_mutex_lock() @ stdcall wined3d_mutex_unlock() -@ cdecl wined3d_calculate_format_pitch(ptr long long long) +@ cdecl wined3d_calculate_format_pitch(ptr long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long) @ cdecl wined3d_check_device_format(ptr ptr long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8f2829d21d0..e1e90a1dbc0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2245,8 +2245,8 @@ typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resour void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); -UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width); +unsigned int __cdecl wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width); HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id); -- 2.20.1

3 3

[PATCH 4/5] wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format().
by Zhiyi Zhang 11 Mar '20

11 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/device.c | 4 +++- dlls/d3d8/directx.c | 7 ++++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/texture.c | 6 +++++- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- dlls/wined3d/directx.c | 18 +++++++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 ++++--- 12 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 92d0c33faf6..05b12504ce9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3355,6 +3355,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct wined3d_device_creation_parameters params; + struct wined3d_adapter *wined3d_adapter; enum wined3d_format_id wined3d_format; D3D_FEATURE_LEVEL feature_level; struct wined3d *wined3d; @@ -3392,9 +3393,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * feature_level = device->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); + wined3d_adapter = wined3d_get_adapter(wined3d, params.adapter_idx); for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) { - hr = wined3d_check_device_format(wined3d, params.adapter_idx, params.device_type, + hr = wined3d_check_device_format(wined3d, wined3d_adapter, params.device_type, WINED3DFMT_UNKNOWN, 0, flag_mapping[i].bind_flags, flag_mapping[i].rtype, wined3d_format); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DOK_NOMIPGEN) continue; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index de35ad55983..cbb638f014d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -295,19 +295,20 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 } wined3d_mutex_lock(); + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) { DWORD levels; - wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); if (SUCCEEDED(hr) && !levels) hr = D3DERR_NOTAVAILABLE; } else - hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + hr = wined3d_check_device_format(d3d8->wined3d, wined3d_adapter, device_type, + wined3dformat_from_d3dformat(adapter_format), usage, bind_flags, wined3d_rtype, + wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a21582d6e1e..a0daaf42880 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -92,6 +92,7 @@ struct d3d9_device struct wined3d_device_parent device_parent; LONG refcount; struct wined3d_device *wined3d_device; + unsigned int adapter_ordinal; struct d3d9 *d3d_parent; struct fvf_declaration *fvf_decls; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 84c119d3e0d..ec1d18a79fe 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4617,6 +4617,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine device->IDirect3DDevice9Ex_iface.lpVtbl = &d3d9_device_vtbl; device->device_parent.ops = &d3d9_wined3d_device_parent_ops; + device->adapter_ordinal = adapter; device->refcount = 1; if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 8d596550a6a..6c8ca1c3d3d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -319,18 +319,18 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, } wined3d_mutex_lock(); + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) { DWORD levels; - wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); if (SUCCEEDED(hr) && !levels) hr = D3DERR_NOTAVAILABLE; } else - hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, + hr = wined3d_check_device_format(d3d9->wined3d, wined3d_adapter, device_type, wined3dformat_from_d3dformat(adapter_format), usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 2ef27a6de3d..0d36c02aaa6 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1296,7 +1296,9 @@ static const struct wined3d_parent_ops d3d9_texture_wined3d_parent_ops = HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) { + struct wined3d_adapter *wined3d_adapter; struct wined3d_resource_desc desc; + unsigned int output_idx; DWORD flags = 0; HRESULT hr; @@ -1346,7 +1348,9 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); - hr = wined3d_check_device_format(device->d3d_parent->wined3d, WINED3DADAPTER_DEFAULT, + output_idx = device->adapter_ordinal; + wined3d_adapter = wined3d_output_get_adapter(device->d3d_parent->wined3d_outputs[output_idx]); + hr = wined3d_check_device_format(device->d3d_parent->wined3d, wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, WINED3DFMT_B8G8R8A8_UNORM, WINED3DUSAGE_QUERY_GENMIPMAP, WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5487855be67..7c13d4abd4b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1720,7 +1720,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes for (i = 0; i < ARRAY_SIZE(formats); ++i) { - if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, + if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, 0, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) { if (count < outsize) @@ -4441,7 +4441,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device for (i = 0; i < ARRAY_SIZE(formats); ++i) { - if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, + if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, ddraw->wined3d_adapter, type, mode.format_id, 0, WINED3D_BIND_DEPTH_STENCIL, WINED3D_RTYPE_TEXTURE_2D, formats[i]))) { DDPIXELFORMAT pformat; @@ -4465,7 +4465,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * while others used dwZBufferBitDepth=32. In either case the pitch matches a 32 bits per * pixel format, so we use dwZBufferBitDepth=32. Some games expect 24. Windows Vista and * newer enumerate both versions, so we do the same(bug 22434) */ - if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, + if (SUCCEEDED(wined3d_check_device_format(ddraw->wined3d, ddraw->wined3d_adapter, type, mode.format_id, 0, WINED3D_BIND_DEPTH_STENCIL, WINED3D_RTYPE_TEXTURE_2D, WINED3DFMT_X8D24_UNORM))) { DDPIXELFORMAT x8d24 = diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ab3584b8fea..3c0ae71196d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1095,8 +1095,9 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { - if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, 0, WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) + if (wined3d_check_device_format(device->ddraw->wined3d, device->ddraw->wined3d_adapter, + WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, WINED3D_BIND_SHADER_RESOURCE, + WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) { DDPIXELFORMAT pformat; @@ -1117,7 +1118,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < ARRAY_SIZE(BumpFormatList); ++i) { - if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, + if (wined3d_check_device_format(device->ddraw->wined3d, device->ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_QUERY_LEGACYBUMPMAP, WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, BumpFormatList[i]) == D3D_OK) { @@ -1223,8 +1224,9 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, for (i = 0; i < ARRAY_SIZE(FormatList); ++i) { - if (wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, 0, WINED3D_BIND_SHADER_RESOURCE, WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) + if (wined3d_check_device_format(device->ddraw->wined3d, device->ddraw->wined3d_adapter, + WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0, WINED3D_BIND_SHADER_RESOURCE, + WINED3D_RTYPE_TEXTURE_2D, FormatList[i]) == D3D_OK) { DDSURFACEDESC sdesc; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a803324c450..627963232e4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6168,7 +6168,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ bind_flags |= WINED3D_BIND_RENDER_TARGET; if (!(ddraw->flags & DDRAW_NO3D) && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, - WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, mode.format_id, + ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, mode.format_id, usage, bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) desc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fcfeaa73481..d026c6a49ef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1558,28 +1558,24 @@ static BOOL wined3d_check_surface_format(const struct wined3d_format *format) * * For now lets report this on all formats, but in the future we may want to * restrict it to some should applications need that. */ -HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, - unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) +HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, + const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, + enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, + enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) { const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; - const struct wined3d_adapter *adapter; BOOL mipmap_gen_supported = TRUE; unsigned int allowed_bind_flags; DWORD format_flags = 0; DWORD allowed_usage; - TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s, " + TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, %s, " "bind_flags %s, resource_type %s, check_format %s.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), + wined3d, adapter, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), debug_d3dusage(usage), debug_d3dusagequery(usage), wined3d_debug_bind_flags(bind_flags), debug_d3dresourcetype(resource_type), debug_d3dformat(check_format_id)); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); @@ -1873,7 +1869,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, } /* Validate that the back buffer format is usable for render targets. */ - if (FAILED(wined3d_check_device_format(wined3d, output->adapter->ordinal, device_type, + if (FAILED(wined3d_check_device_format(wined3d, output->adapter, device_type, display_format, 0, WINED3D_BIND_RENDER_TARGET, WINED3D_RTYPE_TEXTURE_2D, backbuffer_format))) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7000259d0b6..3e511c6c2e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -3,7 +3,7 @@ @ cdecl wined3d_calculate_format_pitch(ptr long long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long) -@ cdecl wined3d_check_device_format(ptr long long long long long long long) +@ cdecl wined3d_check_device_format(ptr ptr long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long ptr) @ cdecl wined3d_check_device_type(ptr ptr long long long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 30d1da2ce25..8f2829d21d0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2250,9 +2250,10 @@ UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id); -HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, UINT adaper_idx, - enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, - unsigned int bind_flags, enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); +HRESULT __cdecl wined3d_check_device_format(const struct wined3d *wined3d, + const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, + enum wined3d_format_id adapter_format_id, DWORD usage, unsigned int bind_flags, + enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id); HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id source_format_id, enum wined3d_format_id target_format_id); -- 2.20.1

2 2