March 2019 - Wine-Commits - list.winehq.org

Józef Kucia : dxgi/tests: Fix potential crashes in test_get_containing_output().
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 670062ae3329d8e43cb974277ca873ed779be3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=670062ae3329d8e43cb97427… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:52 2019 +0100 dxgi/tests: Fix potential crashes in test_get_containing_output(). 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/tests/dxgi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e630a49..a7e60c6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1963,20 +1963,23 @@ static void test_get_containing_output(void) { ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed.\n"); + ok(ret, "Faled to set window position.\n"); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); - ok(!!monitor, "MonitorFromWindow failed.\n"); + ok(!!monitor, "Failed to get monitor from window.\n"); monitor_info.cbSize = sizeof(monitor_info); ret = GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info); ok(ret, "Failed to get monitor info.\n"); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), + "Failed to get containing output, hr %#x.\n", hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + continue; ok(!!output, "Got unexpected containing output %p.\n", output); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output desc, hr %#x.\n", hr); refcount = IDXGIOutput_Release(output); ok(!refcount, "IDXGIOutput has %u references left.\n", refcount);

1 0

Józef Kucia : dxgi/tests: Make sure that device is idle before destroying swapchains.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: d601983971fe173a68f525a07e62d8c6e0f5537f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d601983971fe173a68f525a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:53 2019 +0100 dxgi/tests: Make sure that device is idle before destroying swapchains. 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/tests/dxgi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a7e60c6..fcbaf79 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -608,6 +608,26 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm ID3D12Fence_Release(fence); } +#define wait_device_idle(a) wait_device_idle_(__LINE__, a) +static void wait_device_idle_(unsigned int line, IUnknown *device) +{ + ID3D12Device *d3d12_device; + ID3D12CommandQueue *queue; + HRESULT hr; + + hr = IUnknown_QueryInterface(device, &IID_ID3D12CommandQueue, (void **)&queue); + if (hr != S_OK) + return; + + hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&d3d12_device); + ok_(__FILE__, line)(hr == S_OK, "Failed to get d3d12 device, hr %#x.\n", hr); + + wait_queue_idle_(line, d3d12_device, queue); + + ID3D12CommandQueue_Release(queue); + ID3D12Device_Release(d3d12_device); +} + #define get_factory(a, b, c) get_factory_(__LINE__, a, b, c) static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDXGIFactory **factory) { @@ -3952,6 +3972,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_device_idle(device); + IDXGISwapChain_Release(swapchain); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); @@ -4031,6 +4053,8 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + wait_device_idle(device); + IDXGISwapChain3_Release(swapchain3); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount);

1 0

Józef Kucia : dxgi/tests: Add tests for creating swapchain with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 07b0034b55b8323c9954a80e6828699fea1bcda7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07b0034b55b8323c9954a80e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:57 2019 +0100 dxgi/tests: Add tests for creating swapchain with DXGI_FORMAT_UNKNOWN. 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/tests/dxgi.c | 138 +++++++++++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07b0034b55b8323c9954…

1 0

Józef Kucia : dxgi: Rename d3d12_swapchain_have_user_images() to d3d12_swapchain_has_user_images().
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 9d023a5004dc09c2ee621d280f5516bfe8b2c641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d023a5004dc09c2ee621d28… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:56 2019 +0100 dxgi: Rename d3d12_swapchain_have_user_images() to d3d12_swapchain_has_user_images(). 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0776482..849b94a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1070,7 +1070,7 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } -static BOOL d3d12_swapchain_have_user_images(struct d3d12_swapchain *swapchain) +static BOOL d3d12_swapchain_has_user_images(struct d3d12_swapchain *swapchain) { return !!swapchain->vk_images[0]; } @@ -1089,7 +1089,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (d3d12_swapchain_have_user_images(swapchain)) + if (d3d12_swapchain_has_user_images(swapchain)) return S_OK; memset(&image_info, 0, sizeof(image_info)); @@ -1461,7 +1461,7 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_have_user_images(swapchain))) + if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_has_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -2007,7 +2007,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - if (!d3d12_swapchain_have_user_images(swapchain)) + if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return S_OK; @@ -2040,7 +2040,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pImageIndices = &swapchain->current_buffer_index; present_info.pResults = NULL; - if (d3d12_swapchain_have_user_images(swapchain)) + if (d3d12_swapchain_has_user_images(swapchain)) { /* blit */ submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; @@ -2108,7 +2108,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { vkd3d_release_vk_queue(swapchain->command_queue); - if (!d3d12_swapchain_have_user_images(swapchain)) + if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED; @@ -2141,7 +2141,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface vr = d3d12_swapchain_acquire_next_image(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { - if (!d3d12_swapchain_have_user_images(swapchain)) + if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED;

1 0

Józef Kucia : dxgi: Reject DXGI_FORMAT_UNKNOWN for swapchains.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 42b22b0a77d0ab8ca1e8aaff50ee7782b05ab1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b22b0a77d0ab8ca1e8aaff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:55 2019 +0100 dxgi: Reject DXGI_FORMAT_UNKNOWN for swapchains. 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cf084f7..0776482 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -85,7 +85,7 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; - if (!dxgi_validate_flip_swap_effect_format(desc->Format)) + if (desc->Format && !dxgi_validate_flip_swap_effect_format(desc->Format)) return FALSE; if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) @@ -738,6 +738,9 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi */ if (!implicit) { + if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) + return E_INVALIDARG; + if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, &IID_IDXGIFactory, (void **)&swapchain->factory))) { @@ -2604,6 +2607,9 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu ID3D12Device *device; HRESULT hr; + if (swapchain_desc->Format == DXGI_FORMAT_UNKNOWN) + return DXGI_ERROR_INVALID_CALL; + if (!fullscreen_desc) { memset(&default_fullscreen_desc, 0, sizeof(default_fullscreen_desc));

1 0

Hans Leidekker : advapi32: Add a stub implementation of SaferIdentifyLevel.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 8021d449f4a02aa5e44476e9f9c98e5641e596a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8021d449f4a02aa5e44476e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 6 10:14:27 2019 +0100 advapi32: Add a stub implementation of SaferIdentifyLevel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 11 +++++++++++ include/winsafer.h | 30 ++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e870a5d..eb1f546 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -717,7 +717,7 @@ @ stdcall SaferCreateLevel(long long long ptr ptr) # @ stub SaferGetLevelInformation @ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) -# @ stub SaferIdentifyLevel +@ stdcall SaferIdentifyLevel(long ptr ptr ptr) # @ stub SaferRecordEventLogEntry @ stdcall SaferSetLevelInformation(ptr long ptr long) # @ stub SaferSetPolicyInformation diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da4..6891fee 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6185,6 +6185,17 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class } /****************************************************************************** + * SaferIdentifyLevel [ADVAPI32.@] + */ +BOOL WINAPI SaferIdentifyLevel(DWORD count, SAFER_CODE_PROPERTIES *properties, SAFER_LEVEL_HANDLE *handle, + void *reserved) +{ + FIXME("(%u %p %p %p) stub\n", count, properties, handle, reserved); + *handle = (SAFER_LEVEL_HANDLE)0xdeadbeef; + return TRUE; +} + +/****************************************************************************** * SaferSetLevelInformation [ADVAPI32.@] */ BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INFO_CLASS infotype, diff --git a/include/winsafer.h b/include/winsafer.h index 4855f53..2565484 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,32 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_MAX_HASH_SIZE 64 + +#include <pshpack8.h> +typedef struct _SAFER_CODE_PROPERTIES_V2 { + DWORD cbSize; + DWORD dwCheckFlags; + LPCWSTR ImagePath; + HANDLE hImageFileHandle; + DWORD UrlZoneId; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + DWORD dwImageHashSize; + LARGE_INTEGER ImageSize; + ALG_ID HashAlgorithm; + LPBYTE pByteBlock; + HWND hWndParent; + DWORD dwWVTUIChoice; + LPCWSTR PackageMoniker; + LPCWSTR PackagePublisher; + LPCWSTR PackageName; + ULONG64 PackageVersion; + BOOL PackageIsFramework; +} SAFER_CODE_PROPERTIES_V2, *PSAFER_CODE_PROPERTIES_V2; + +typedef SAFER_CODE_PROPERTIES_V2 SAFER_CODE_PROPERTIES, *PSAFER_CODE_PROPERTIES; +#include <poppack.h> + #define SAFER_SCOPEID_MACHINE 1 #define SAFER_SCOPEID_USER 2 @@ -41,8 +67,6 @@ DECLARE_HANDLE(SAFER_LEVEL_HANDLE); #define SAFER_LEVEL_OPEN 1 -WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); - typedef enum _SAFER_POLICY_INFO_CLASS { SaferPolicyLevelList = 1, SaferPolicyEnableTransparentEnforcement, @@ -70,7 +94,9 @@ typedef enum _SAFER_OBJECT_INFO_CLASS { SaferObjectExtendedError } SAFER_OBJECT_INFO_CLASS; +WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +WINADVAPI BOOL WINAPI SaferIdentifyLevel(DWORD,PSAFER_CODE_PROPERTIES,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE,SAFER_OBJECT_INFO_CLASS,LPVOID,DWORD); #ifdef __cplusplus

1 0

Hans Leidekker : bcrypt: Implement BCRYPT_HASH_REUSABLE_FLAG.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 98ea906b963ad536bbe02fd66aa8cc88c4cb1805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98ea906b963ad536bbe02fd6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 6 10:14:28 2019 +0100 bcrypt: Implement BCRYPT_HASH_REUSABLE_FLAG. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 102 +++++++++++++++++++------------ dlls/bcrypt/tests/bcrypt.c | 145 ++++++++++++++++++++++++++++++++------------- include/bcrypt.h | 3 + 3 files changed, 173 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98ea906b963ad536bbe0…

1 0

Józef Kucia : dxgi: Implement dxgi_output_FindClosestMatchingMode1().
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 11dfed9f9e0d3ce296c93f32b5413a7a8cfb18c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11dfed9f9e0d3ce296c93f32… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:54 2019 +0100 dxgi: Implement dxgi_output_FindClosestMatchingMode1(). 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/dxgi_private.h | 3 ++ dlls/dxgi/output.c | 85 +++++++++++++++++++++++++++++++++--------------- dlls/dxgi/utils.c | 25 ++++++++++++++ 3 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 320a347..1461e3c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -80,6 +80,7 @@ struct dxgi_device_layer /* TRACE helper functions */ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) DECLSPEC_HIDDEN; +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) DECLSPEC_HIDDEN; void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; @@ -91,6 +92,8 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; +void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC1 *mode) DECLSPEC_HIDDEN; DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index bf0a415..b1f20b9 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -34,6 +34,47 @@ static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_di mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ } +static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_display_mode *wined3d_mode) +{ + mode->Width = wined3d_mode->width; + mode->Height = wined3d_mode->height; + mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; + mode->RefreshRate.Denominator = 1; + mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); + mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ + mode->Stereo = FALSE; /* FIXME */ +} + +static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output, + struct wined3d_display_mode *mode, IUnknown *device) +{ + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; + + if (!mode->width != !mode->height) + return DXGI_ERROR_INVALID_CALL; + + if (mode->format_id == WINED3DFMT_UNKNOWN && !device) + return DXGI_ERROR_INVALID_CALL; + + if (mode->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Matching formats to device not implemented.\n"); + return E_NOTIMPL; + } + + wined3d_mutex_lock(); + adapter = output->adapter; + wined3d = adapter->factory->wined3d; + + hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, mode); + wined3d_mutex_unlock(); + + return hr; +} + static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); @@ -234,33 +275,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); struct wined3d_display_mode wined3d_mode; - struct dxgi_adapter *adapter; - struct wined3d *wined3d; HRESULT hr; - TRACE("iface %p, mode %p, closest_match %p, device %p.\n", iface, mode, closest_match, device); - - if ((!mode->Width && mode->Height) || (mode->Width && !mode->Height)) - return DXGI_ERROR_INVALID_CALL; - - if (mode->Format == DXGI_FORMAT_UNKNOWN && !device) - return DXGI_ERROR_INVALID_CALL; - - TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); - if (mode->Format == DXGI_FORMAT_UNKNOWN) - { - FIXME("Matching formats to device not implemented.\n"); - return E_NOTIMPL; - } - - adapter = output->adapter; - wined3d = adapter->factory->wined3d; + TRACE("iface %p, mode %s, closest_match %p, device %p.\n", + iface, debug_dxgi_mode(mode), closest_match, device); - wined3d_mutex_lock(); wined3d_display_mode_from_dxgi(&wined3d_mode, mode); - hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, &wined3d_mode); - wined3d_mutex_unlock(); - + hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); if (SUCCEEDED(hr)) { dxgi_mode_from_wined3d(closest_match, &wined3d_mode); @@ -366,10 +387,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *i static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface, const DXGI_MODE_DESC1 *mode, DXGI_MODE_DESC1 *closest_match, IUnknown *device) { - FIXME("iface %p, mode %p, closest_match %p, device %p stub!\n", - iface, mode, closest_match, device); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_display_mode wined3d_mode; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, mode %s, closest_match %p, device %p.\n", + iface, debug_dxgi_mode1(mode), closest_match, device); + + wined3d_display_mode_from_dxgi1(&wined3d_mode, mode); + hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); + if (SUCCEEDED(hr)) + { + dxgi_mode1_from_wined3d(closest_match, &wined3d_mode); + TRACE("Returning %s.\n", debug_dxgi_mode1(closest_match)); + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 *iface, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 3a67cfe..23f5188 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -380,12 +380,26 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) { + if (!desc) + return "(null)"; + return wine_dbg_sprintf("resolution %ux%u, refresh rate %u / %u, " "format %s, scanline ordering %#x, scaling %#x", desc->Width, desc->Height, desc->RefreshRate.Numerator, desc->RefreshRate.Denominator, debug_dxgi_format(desc->Format), desc->ScanlineOrdering, desc->Scaling); } +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) +{ + if (!desc) + return "(null)"; + + return wine_dbg_sprintf("resolution %ux%u, refresh rate %u / %u, " + "format %s, scanline ordering %#x, scaling %#x, stereo %#x", + desc->Width, desc->Height, desc->RefreshRate.Numerator, desc->RefreshRate.Denominator, + debug_dxgi_format(desc->Format), desc->ScanlineOrdering, desc->Scaling, desc->Stereo); +} + void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) { unsigned int i; @@ -455,6 +469,17 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); } +void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC1 *mode) +{ + wined3d_mode->width = mode->Width; + wined3d_mode->height = mode->Height; + wined3d_mode->refresh_rate = dxgi_rational_to_uint(&mode->RefreshRate); + wined3d_mode->format_id = wined3dformat_from_dxgi_format(mode->Format); + wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); + FIXME("Ignoring stereo %#x.\n", mode->Stereo); +} + DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) { DXGI_USAGE dxgi_usage = 0;

1 0

Matteo Bruni : d3d9/tests: Clarify that D3DFMT_A8R8G8B8 isn' t a supported adapter format.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 8b8c35038c0c90e7a263bfae26d3154358a27419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8c35038c0c90e7a263bfae… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 5 20:37:18 2019 +0100 d3d9/tests: Clarify that D3DFMT_A8R8G8B8 isn't a supported adapter format. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 52 +++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b7e34b0..76d19b9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11671,11 +11671,6 @@ static void test_swapchain_parameters(void) static void test_check_device_format(void) { - static const D3DFORMAT adapter_formats[] = - { - D3DFMT_A8R8G8B8, - D3DFMT_X8R8G8B8, - }; static const D3DFORMAT mipmap_autogen_formats[] = { D3DFMT_R8G8B8, @@ -11689,11 +11684,11 @@ static void test_check_device_format(void) D3DFMT_A4R4G4B4, }; - D3DFORMAT adapter_format, format; BOOL render_target_supported; D3DDEVTYPE device_type; - unsigned int i, j; + D3DFORMAT format; IDirect3D9 *d3d; + unsigned int i; HRESULT hr; d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -11750,29 +11745,32 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(adapter_formats); ++i) - { - adapter_format = adapter_formats[i]; + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3D_OK || broken(hr == D3DERR_NOTAVAILABLE) /* Testbot Windows <= 7 */, + "Got unexpected hr %#x.\n", hr); - for (j = 0; j < ARRAY_SIZE(mipmap_autogen_formats); ++j) - { - format = mipmap_autogen_formats[j]; + for (i = 0; i < ARRAY_SIZE(mipmap_autogen_formats); ++i) + { + format = mipmap_autogen_formats[i]; - hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, - D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); - render_target_supported = hr == D3D_OK; + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + render_target_supported = hr == D3D_OK; - hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, - D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format); - if (render_target_supported) - { - ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr); - } - else - { - ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); - } + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format); + if (render_target_supported) + { + ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr); + } + else + { + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); } }

1 0

Józef Kucia : wined3d: Implement eval_sample_index shader instruction.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 89f124ffc51d0cb8d17d8003d57a86e8e087a1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f124ffc51d0cb8d17d8003… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 15:02:59 2019 +0100 wined3d: Implement eval_sample_index shader instruction. 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/glsl_shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa6e302..ebc0159 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6175,6 +6175,22 @@ static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins shader_addline(buffer, ", 0, 0, 0)%s);\n", dst_swizzle); } +static void shader_glsl_interpolate(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_src_param *input = &ins->src[0]; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param sample_param; + char dst_swizzle[6]; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + shader_glsl_get_swizzle(input, FALSE, write_mask, dst_swizzle); + + shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &sample_param); + shader_addline(buffer, "interpolateAtSample(shader_in.reg%u, %s)%s);\n", + input->reg.idx[0].offset, sample_param.param_str, dst_swizzle); +} + static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -11466,7 +11482,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, + /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_F16TOF32 */ shader_glsl_float16,

1 0