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

[PATCH v2 01/10] ddraw: Store hardware_device flag in struct d3d_device.
by Paul Gofman 10 Mar '21

10 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 200969-200979. v2: - no changes. dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330c307..705d0335d95 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4330,7 +4330,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL))) { *device = &object->IDirect3DDevice7_iface; } @@ -4359,7 +4359,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice3_iface; } @@ -4385,7 +4385,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6bbd62949ac..e25ab23c2bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -317,6 +317,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; + BOOL hardware_device; IUnknown *outer_unknown; struct wined3d_device *wined3d_device; @@ -364,7 +365,7 @@ struct d3d_device const struct wined3d_stateblock_state *stateblock_state; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4d24c22650e..5e66007213d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6925,7 +6925,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } -static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const struct wined3d_matrix ident = @@ -6948,6 +6948,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; + device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) + || IsEqualGUID(&IID_IDirect3DHALDevice, guid); if (outer_unknown) device->outer_unknown = outer_unknown; @@ -7006,14 +7008,14 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; HRESULT hr; - TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", - ddraw, target, version, device, outer_unknown); + TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n", + ddraw, debugstr_guid(guid), target, version, device, outer_unknown); if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) @@ -7054,7 +7056,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } - if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) + if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ca19d4f8a5..b910fb6817e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -256,7 +256,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; - if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface, 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -- 2.29.2

3 23

Question about recommended clang option
by Dean Greer 10 Mar '21

10 Mar '21

Hi all, I know https://wiki.winehq.org/Clang hasn’t been updated in forever so I’m wondering is it still recommended to to set CFLAGS=“-std=gnu89” I’m asking as I’m able to compile using clang with and without this option for both wine-devel and wine-staging, so is this really require or any drawbacks to using or not using this option?

2 1

[PATCH] winetest: Avoid duplicating the extract_test_proc() cleanup code.
by Francois Gouget 10 Mar '21

10 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 54 ++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1731850bfdb..408e1b3c706 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -890,6 +890,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP DWORD err; HANDLE actctx; ULONG_PTR cookie; + BOOL run; if (aborting) return TRUE; @@ -941,50 +942,39 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP else dll = 0; } + run = TRUE; if (!dll) { xprintf (" %s=dll is missing\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) - { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); - } - return TRUE; + run = FALSE; } - if(is_stub_dll(dllname)) + else { - FreeLibrary(dll); - xprintf (" %s=dll is a stub\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) + if (is_stub_dll(dllname)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=dll is a stub\n", dllname); + run = FALSE; } - return TRUE; - } - if (is_native_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - nr_native_dlls++; - if (actctx != INVALID_HANDLE_VALUE) + else if (is_native_dll(dll)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; + run = FALSE; } - return TRUE; + FreeLibrary(dll); } - FreeLibrary(dll); - if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) + if (run) { - xprintf (" %s=%s\n", dllname, get_file_version(filename)); - nr_of_tests += wine_tests[nr_of_files].subtest_count; - nr_of_files++; - } - else - { - xprintf (" %s=load error %u\n", dllname, err); + err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); + if (!err) + { + xprintf (" %s=%s\n", dllname, get_file_version(filename)); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + } + else + xprintf (" %s=load error %u\n", dllname, err); } if (actctx != INVALID_HANDLE_VALUE) -- 2.20.1

1 0

[PATCH] widl: Allow runtimeclass to not have a default interface.
by Rémi Bernon 10 Mar '21

10 Mar '21

Or any interfaces, as long as they have a static factory, as MIDL requires. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/header.c | 2 +- tools/widl/typetree.c | 11 ++++++----- tools/widl/typetree.h | 8 ++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 40c1f9d008e..a5e5d6c6fb3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -488,7 +488,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i fprintf(h, "%s", type_get_qualified_name(t, name_type)); break; case TYPE_RUNTIMECLASS: - fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t), name_type)); + fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t, TRUE), name_type)); break; case TYPE_DELEGATE: fprintf(h, "%s", type_get_qualified_name(type_delegate_get_iface(t), name_type)); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 591a58b2849..a4e1696d2af 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -188,7 +188,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t n += strappend(buf, len, pos + n, "rc("); n += append_namespaces(buf, len, pos + n, type->namespace, "", ".", type->name, NULL); n += strappend(buf, len, pos + n, ";"); - n += append_type_signature(buf, len, pos + n, type_runtimeclass_get_default_iface(type)); + n += append_type_signature(buf, len, pos + n, type_runtimeclass_get_default_iface(type, TRUE)); n += strappend(buf, len, pos + n, ")"); return n; case TYPE_POINTER: @@ -379,7 +379,7 @@ static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *p { pos += strappend(&buf, &len, pos, "ABI::Windows::Foundation::Internal::AggregateType<%s", type->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); - iface = type_runtimeclass_get_default_iface(type); + iface = type_runtimeclass_get_default_iface(type, TRUE); pos += strappend(&buf, &len, pos, ", %s", iface->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); pos += strappend(&buf, &len, pos, " >"); @@ -843,10 +843,11 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typer runtimeclass->attrs = check_runtimeclass_attrs(runtimeclass->name, attrs); runtimeclass->details.runtimeclass.ifaces = ifaces; runtimeclass->defined = TRUE; - if (!type_runtimeclass_get_default_iface(runtimeclass)) - error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); + if (!type_runtimeclass_get_default_iface(runtimeclass, FALSE) && + !get_attrp(runtimeclass->attrs, ATTR_STATIC)) + error_loc("runtimeclass %s must have a default interface or static factory\n", runtimeclass->name); - LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (ifaces) LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) { /* FIXME: this should probably not be allowed, here or in coclass, */ /* but for now there's too many places in Wine IDL where it is to */ diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index b9833dc4e8f..b43b6bfbf79 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -20,6 +20,9 @@ #include "widltypes.h" #include <assert.h> +#include <stdio.h> + +#include "utils.h" #ifndef WIDL_TYPE_TREE_H #define WIDL_TYPE_TREE_H @@ -379,7 +382,7 @@ static inline typeref_list_t *type_runtimeclass_get_ifaces(const type_t *type) return type->details.runtimeclass.ifaces; } -static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) +static inline type_t *type_runtimeclass_get_default_iface(const type_t *type, int check) { typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; @@ -389,7 +392,8 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) if (is_attr(ref->attrs, ATTR_DEFAULT)) return ref->type; - return NULL; + if (!check) return NULL; + error_loc_info(&type->loc_info, "runtimeclass %s needs a default interface\n", type->name); } static inline type_t *type_delegate_get_iface(const type_t *type) -- 2.30.0

2 1

[PATCH resend 1/2] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only with DDSCL_NOWINDOWCHANGES or if window inactive.
by Gabriel Ivăncescu 10 Mar '21

10 Mar '21

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ddraw/ddraw.c | 18 ++++++----- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330..f61b4c6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -559,7 +559,7 @@ static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) } static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, - BOOL windowed, struct wined3d_swapchain **wined3d_swapchain) + DWORD cooplevel, struct wined3d_swapchain **wined3d_swapchain) { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode mode; @@ -582,9 +582,11 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.backbuffer_count = 1; swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; - swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetActiveWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, @@ -640,7 +642,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, return DD_OK; } -static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL windowed) +static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, DWORD cooplevel) { HRESULT hr; @@ -650,7 +652,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win return E_FAIL; } - if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, windowed, &ddraw->wined3d_swapchain))) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, cooplevel, &ddraw->wined3d_swapchain))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; @@ -776,7 +778,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * Unsure about this: DDSCL_FPUSETUP * * These don't seem very important for wine: - * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX + * DDSCL_ALLOWREBOOT, DDSCL_ALLOWMODEX * * Returns: * DD_OK if the cooperative level was set successfully @@ -945,7 +947,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw_destroy_swapchain(ddraw); } - if (FAILED(hr = ddraw_create_swapchain(ddraw, window, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(ddraw, window, cooplevel))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 57bc622..4f42f3c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2594,6 +2594,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d2889aa..d545f23 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2648,6 +2648,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6e003fb..3c1293c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2883,6 +2883,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 559d13d..bb535cc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2532,6 +2532,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); -- 2.30.0

2 3

[PATCH v2 1/6] d3d11/tests: Added another tests for multisample resolve.
by Jan Sikorski 10 Mar '21

10 Mar '21

This one checks results of blending of background and foreground samples, and a wider variety of pixel formats. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 325 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 325 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6cdac34c0cd..f0bdd26a948 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -260,6 +260,13 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } +static BOOL compare_int(int x, int y, int max_diff) +{ + int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) { unsigned int diff = x > y ? x - y : y - x; @@ -280,6 +287,15 @@ static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } +static BOOL compare_scolor(DWORD c1, DWORD c2, BYTE max_diff) +{ + signed char c1x = c1, c1y = (c1 >> 8), c1z = (c1 >> 16), c1w = (c1 >> 24); + signed char c2x = c2, c2y = (c2 >> 8), c2z = (c2 >> 16), c2w = (c2 >> 24); + + return compare_int(c1x, c2x, max_diff) && compare_int(c1y, c2y, max_diff) + && compare_int(c1z, c2z, max_diff) && compare_int(c1w, c2w, max_diff); +} + static char const *debugstr_viewport(D3D11_VIEWPORT *vp) { if (!vp) return "(null)"; @@ -30057,6 +30073,314 @@ done: release_test_context(&test_context); } +static void test_multisample_resolve_blended(void) +{ + static const D3D11_VIEWPORT viewport = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; + static const float clear_color[4] = {0.2f, 0.2f, 0.2f, 1.0f}; + unsigned int vertex_buffer_stride = 6 * sizeof(float); + ID3D11PixelShader *pixel_shader, *pixel_shader_uint; + ID3D11Texture2D *resolve_target, *render_target; + D3D11_RENDER_TARGET_VIEW_DESC render_view_desc; + ID3D11RenderTargetView *render_target_view; + unsigned int vertex_buffer_offset = 0; + ID3D11DeviceContext *device_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11VertexShader *vertex_shader; + ID3D11InputLayout *input_layout; + unsigned int i, quality_levels; + struct resource_readback rb; + ID3D11Buffer *vertex_buffer; + unsigned char *result; + ID3D11Device *device; + BOOL compare_ok; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct VS_Input + { + float2 pos : TEXCOORD0; + float4 color : COLOR; + }; + + struct VS_Output + { + float4 position : SV_POSITION; + float4 color : COLOR; + }; + + VS_Output vs_main(VS_Input input) + { + VS_Output output; + output.position = float4(input.pos, 0.0f, 1.0f); + output.color = input.color; + + return output; + } +#endif + 0x43425844, 0x3fbe97c7, 0x2cdce39d, 0xa8d3bf48, 0xe0d872e3, 0x00000001, 0x00000160, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000d0, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000303, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f, 0x4e47534f, + 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x505f5653, + 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000088, 0x00010040, 0x00000022, + 0x0300005f, 0x00101032, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x00102032, 0x00000000, + 0x00101046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, 0x0100003e, + }; + + static const DWORD ps_code[] = + { +#if 0 + float4 ps_main(VS_Output input) : SV_TARGET + { + return input.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e + }; + + static const DWORD ps_uint_code[] = + { +#if 0 + uint4 ps_main_uint(VS_Output input) : SV_TARGET + { + return 255 * input.color; + } +#endif + 0x43425844, 0x9c2c834b, 0x37ca7b30, 0x01b4b43e, 0x713b001e, 0x00000001, 0x00000124, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000068, 0x00000040, + 0x0000001a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x001000f2, 0x00000000, 0x00101e46, 0x00000001, 0x00004002, 0x437f0000, + 0x437f0000, 0x437f0000, 0x437f0000, 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x0100003e + }; + + static const struct + { + struct vec2 xy; + struct vec4 rgba; + } + vertex_data[] = + { + {{ 1.0f, 1.0f }, { .8f, 0.f, 0.f, 1.f }}, + {{ 1.0f, -1.0f }, { .8f, 0.f, 0.f, 1.f }}, + {{-1.0f, -1.0f }, { .8f, 0.f, 0.f, 1.f }}, + }; + + static const D3D11_INPUT_ELEMENT_DESC input_elements[] = + { + { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, + { "COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 } + }; + + static const struct + { + BOOL use_uint_shader; + DXGI_FORMAT render_target_view_format; + DXGI_FORMAT source_format; + DXGI_FORMAT destination_format; + DXGI_FORMAT resolve_format; + unsigned int byte_count; + unsigned char expected[4]; + BOOL todo; + } + tests[] = + { + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f } }, + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f }, TRUE }, + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f }, TRUE }, + { FALSE, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_TYPELESS, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_R32_FLOAT, + 4, { 0, 0, 0, 0x3f }, TRUE }, + { FALSE, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_UNORM, + DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_UNORM, + 2, { 0, 0x80 } }, + { FALSE, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT, + 2, { 0xff, 0x37 } }, + { FALSE, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_FLOAT, + 2, { 0xff, 0x37 } }, + { FALSE, DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_UNORM, + 2, { 0x66, 0x36 }, TRUE }, + { FALSE, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_TYPELESS, + DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_FLOAT, + 2, { 0xbd, 0xc8 } }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x80, 0x19, 0x19, 0xff } }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + 4, { 0x99, 0x23, 0x23, 0xff }, TRUE }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + 4, { 0x99, 0x23, 0x23, 0xff }, TRUE }, + { FALSE, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_SNORM, + 4, { 0, 0x19, 0x19, 0xff }, TRUE }, + { FALSE, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x3f, 0xc, 0xc, 0x7f }, TRUE }, + { TRUE, DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x3f, 0, 0, 0x40 }, TRUE }, + { TRUE, DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_SNORM, + 4, { 0x40, 0, 0, 0x40 }, TRUE }, + { TRUE, DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, + 4, { 0x66, 0, 0, 0x80 }, TRUE }, + }; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.MiscFlags = 0; + + render_view_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &device_context); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), + NULL, &vertex_shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), + NULL, &pixel_shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_uint_code, sizeof(ps_uint_code), + NULL, &pixel_shader_uint); + ok(SUCCEEDED(hr),"Failed to create uint pixel shader, hr %#x.\n", hr); + + hr = ID3D11Device_CreateInputLayout(device, input_elements, + ARRAY_SIZE(input_elements), vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vertex_buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, + sizeof(vertex_data), vertex_data); + + ID3D11DeviceContext_IASetVertexBuffers(device_context, 0, 1, &vertex_buffer, + &vertex_buffer_stride, &vertex_buffer_offset); + ID3D11DeviceContext_IASetPrimitiveTopology(device_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D11DeviceContext_IASetInputLayout(device_context, input_layout); + ID3D11DeviceContext_VSSetShader(device_context, vertex_shader, NULL, 0); + ID3D11DeviceContext_RSSetViewports(device_context, 1, &viewport); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = ID3D11Device_CheckMultisampleQualityLevels(device, tests[i].source_format, 2, &quality_levels); + ok(SUCCEEDED(hr), "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_levels) + { + skip("Test %3u: 2xMSAA not supported.\n", i); + continue; + } + + texture_desc.Format = tests[i].source_format; + texture_desc.SampleDesc.Count = 2; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &render_target); + ok(SUCCEEDED(hr), "Failed to create render target texture, hr %#x.\n", hr); + + texture_desc.Format = tests[i].destination_format; + texture_desc.SampleDesc.Count = 1; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &resolve_target); + ok(SUCCEEDED(hr), "Failed to create resolve texture, hr %#x.\n", hr); + + render_view_desc.Format = tests[i].render_target_view_format; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)render_target, + &render_view_desc, &render_target_view); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetViewports(device_context, 1, &viewport); + ID3D11DeviceContext_OMSetRenderTargets(device_context, 1, &render_target_view, NULL); + ID3D11DeviceContext_PSSetShader(device_context, tests[i].use_uint_shader ? pixel_shader_uint : pixel_shader, NULL, 0); + ID3D11DeviceContext_ClearRenderTargetView(device_context, render_target_view, clear_color); + ID3D11DeviceContext_Draw(device_context, 3, 0); + ID3D11DeviceContext_ResolveSubresource(device_context, (ID3D11Resource *)resolve_target, + 0, (ID3D11Resource *)render_target, 0, tests[i].resolve_format); + + get_texture_readback(resolve_target, 0, &rb); + result = get_readback_data(&rb, 0, 0, 0, tests[i].byte_count); + + switch (tests[i].resolve_format) + { + case DXGI_FORMAT_R32_FLOAT: + compare_ok = compare_float(*(float *)result, *(float *)tests[i].expected, 2); + break; + case DXGI_FORMAT_R16_UNORM: + case DXGI_FORMAT_R16_FLOAT: + compare_ok = compare_uint(*(WORD *)result, *(WORD *)tests[i].expected, 2); + break; + case DXGI_FORMAT_R8G8B8A8_UNORM: + case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: + compare_ok = compare_color(*(DWORD *)result, *(DWORD *)tests[i].expected, 2); + break; + case DXGI_FORMAT_R8G8B8A8_SNORM: + compare_ok = compare_scolor(*(DWORD *)result, *(DWORD *)tests[i].expected, 2); + break; + default: + trace("Test %3u: unhandled format.\n", i); + compare_ok = FALSE; + break; + } + + todo_wine_if(tests[i].todo) + ok(compare_ok, "Test %3u: expected: %2x %2x %2x %2x, got: %2x %2x %2x %2x.\n", i, + tests[i].expected[0], tests[i].expected[1], tests[i].expected[2], tests[i].expected[3], + result[0], result[1], result[2], result[3]); + + release_resource_readback(&rb); + ID3D11RenderTargetView_Release(render_target_view); + ID3D11Texture2D_Release(render_target); + ID3D11Texture2D_Release(resolve_target); + } + + ID3D11Buffer_Release(vertex_buffer); + ID3D11InputLayout_Release(input_layout); + ID3D11PixelShader_Release(pixel_shader_uint); + ID3D11PixelShader_Release(pixel_shader); + ID3D11VertexShader_Release(vertex_shader); + ID3D11DeviceContext_Release(device_context); + ID3D11Device_Release(device); +} + static void test_multisample_resolve(void) { struct d3d11_test_context test_context; @@ -32284,6 +32608,7 @@ START_TEST(d3d11) queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); queue_test(test_multisample_resolve); + queue_test(test_multisample_resolve_blended); queue_test(test_sample_shading); queue_test(test_sample_mask); queue_test(test_depth_clip); -- 2.30.1

3 13

[PATCH 5/5] secur32: Return more attributes from schan_InitializeSecurityContextW.
by Hans Leidekker 10 Mar '21

10 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index e7673a7f814..1dd3a029401 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -958,10 +958,11 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } *pfContextAttr = ISC_RET_REPLAY_DETECT | ISC_RET_SEQUENCE_DETECT | ISC_RET_CONFIDENTIALITY | ISC_RET_STREAM; - if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) - *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; - if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) - *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; + if (ctx->req_ctx_attr & ISC_REQ_EXTENDED_ERROR) *pfContextAttr |= ISC_RET_EXTENDED_ERROR; + if (ctx->req_ctx_attr & ISC_REQ_DATAGRAM) *pfContextAttr |= ISC_RET_DATAGRAM; + if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; + if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; + if (ctx->req_ctx_attr & ISC_REQ_MANUAL_CRED_VALIDATION) *pfContextAttr |= ISC_RET_MANUAL_CRED_VALIDATION; return ret; } -- 2.30.1

1 0

[PATCH 4/5] secur32: Add support for setting DTLS MTU.
by Hans Leidekker 10 Mar '21

10 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 7 +++++++ dlls/secur32/schannel_gnutls.c | 20 ++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 6 ++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 34 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a1dfd42152..e7673a7f814 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,6 +879,13 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( schan_imp_set_application_protocols(ctx->session, buffer->pvBuffer, buffer->cbBuffer); } + if (pInput && (idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_DTLS_MTU)) != -1) + { + buffer = &pInput->pBuffers[idx]; + if (buffer->cbBuffer >= sizeof(WORD)) schan_imp_set_dtls_mtu(ctx->session, *(WORD *)buffer->pvBuffer); + else WARN("invalid buffer size %u\n", buffer->cbBuffer); + } + phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fbf9277a39c..785430ddf58 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -53,6 +53,7 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); /* Not present in gnutls version < 3.0. */ static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, int (*)(gnutls_transport_ptr_t, unsigned int)); +static void (*pgnutls_dtls_set_mtu)(gnutls_session_t, unsigned int); /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); @@ -186,6 +187,11 @@ static int compat_gnutls_alpn_set_protocols(gnutls_session_t session, const gnut return GNUTLS_E_INVALID_REQUEST; } +static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mtu) +{ + FIXME("\n"); +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -767,6 +773,15 @@ SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, return SEC_E_OK; } +SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session session, unsigned int mtu) +{ + gnutls_session_t s = (gnutls_session_t)session; + + pgnutls_dtls_set_mtu(s, mtu); + TRACE("MTU set to %u\n", mtu); + return SEC_E_OK; +} + static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { static const WCHAR rsabaseW[] = @@ -1130,6 +1145,11 @@ BOOL schan_imp_init(void) WARN("gnutls_alpn_get_selected_protocol not found\n"); pgnutls_alpn_get_selected_protocol = compat_gnutls_alpn_get_selected_protocol; } + if (!(pgnutls_dtls_set_mtu = dlsym(libgnutls_handle, "gnutls_dtls_set_mtu"))) + { + WARN("gnutls_dtls_set_mtu not found\n"); + pgnutls_dtls_set_mtu = compat_gnutls_dtls_set_mtu; + } if (!(pgnutls_privkey_export_x509 = dlsym(libgnutls_handle, "gnutls_privkey_export_x509"))) { WARN("gnutls_privkey_export_x509 not found\n"); diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 6e6296722cc..ab97615014d 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1213,6 +1213,12 @@ SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, return SEC_E_UNSUPPORTED_FUNCTION; } +SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session session, unsigned int mtu) +{ + FIXME("no support for setting dtls mtu on this platform\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + BOOL schan_imp_init(void) { TRACE("()\n"); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index ce8d55d1eb6..ca0062056d6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -253,5 +253,6 @@ extern void schan_imp_deinit(void) DECLSPEC_HIDDEN; extern void schan_imp_set_application_protocols(schan_imp_session, unsigned char *, unsigned int) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session, SecPkgContext_ApplicationProtocol *) DECLSPEC_HIDDEN; +extern SECURITY_STATUS schan_imp_set_dtls_mtu(schan_imp_session, unsigned int) DECLSPEC_HIDDEN; #endif /* ndef __SECUR32_PRIV_H__ */ -- 2.30.1

1 0

[PATCH 3/5] secur32: Add DTLS support.
by Hans Leidekker 10 Mar '21

10 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 89 +++++++++++++++++++++------------- dlls/secur32/schannel_gnutls.c | 39 ++++++++++++++- 2 files changed, 92 insertions(+), 36 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 3a34007a8cb..9a1dfd42152 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -60,6 +60,7 @@ struct schan_context struct schan_transport transport; ULONG req_ctx_attr; const CERT_CONTEXT *cert; + SIZE_T header_size; }; static struct schan_handle *schan_handle_table; @@ -184,7 +185,9 @@ static void read_config(void) {{'S','S','L',' ','3','.','0',0}, SP_PROT_SSL3_CLIENT, TRUE, FALSE}, {{'T','L','S',' ','1','.','0',0}, SP_PROT_TLS1_0_CLIENT, TRUE, FALSE}, {{'T','L','S',' ','1','.','1',0}, SP_PROT_TLS1_1_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ }, - {{'T','L','S',' ','1','.','2',0}, SP_PROT_TLS1_2_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ } + {{'T','L','S',' ','1','.','2',0}, SP_PROT_TLS1_2_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ }, + {{'D','T','L','S',' ','1','.','0',0}, SP_PROT_DTLS1_0_CLIENT, TRUE, TRUE }, + {{'D','T','L','S',' ','1','.','2',0}, SP_PROT_DTLS1_2_CLIENT, TRUE, TRUE }, }; /* No need for thread safety */ @@ -399,10 +402,17 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (schanCred) { + const unsigned dtls_protocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; + const unsigned tls_protocols = SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | + SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_3_CLIENT; + status = get_cert(schanCred, &cert); if (status != SEC_E_OK && status != SEC_E_NO_CREDENTIALS) return status; + if ((schanCred->grbitEnabledProtocols & tls_protocols) && + (schanCred->grbitEnabledProtocols & dtls_protocols)) return SEC_E_ALGORITHM_MISMATCH; + status = SEC_E_OK; } @@ -773,12 +783,18 @@ static void dump_buffer_desc(SecBufferDesc *desc) } #define HEADER_SIZE_TLS 5 +#define HEADER_SIZE_DTLS 13 static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) { return (buf[header_size - 2] << 8) | buf[header_size - 1]; } +static inline BOOL is_dtls_context(const struct schan_context *ctx) +{ + return (ctx->header_size == HEADER_SIZE_DTLS); +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -836,6 +852,11 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } + if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) + ctx->header_size = HEADER_SIZE_DTLS; + else + ctx->header_size = HEADER_SIZE_TLS; + ctx->transport.ctx = ctx; schan_imp_set_session_transport(ctx->session, &ctx->transport); @@ -866,38 +887,38 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( SIZE_T record_size = 0; unsigned char *ptr; - if (!pInput) - return SEC_E_INCOMPLETE_MESSAGE; - - idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); - if (idx == -1) - return SEC_E_INCOMPLETE_MESSAGE; + ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); + if (pInput) + { + idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); + if (idx == -1) + return SEC_E_INCOMPLETE_MESSAGE; - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; + expected_size = 0; - while (buffer->cbBuffer > expected_size + HEADER_SIZE_TLS) - { - record_size = HEADER_SIZE_TLS + read_record_size(ptr, HEADER_SIZE_TLS); + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - if (buffer->cbBuffer < expected_size + record_size) - break; + if (buffer->cbBuffer < expected_size + record_size) + break; - expected_size += record_size; - ptr += record_size; - } + expected_size += record_size; + ptr += record_size; + } - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(6, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(6, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; + } } + else if (!is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); - - ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); } ctx->req_ctx_attr = fContextReq; @@ -1038,11 +1059,11 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( unsigned int block_size = schan_imp_get_session_cipher_block_size(ctx->session); unsigned int message_size = schan_imp_get_max_message_size(ctx->session); - TRACE("Using %lu mac bytes, message size %u, block size %u\n", - mac_size, message_size, block_size); + TRACE("Using header size %lu mac bytes %lu, message size %u, block size %u\n", + ctx->header_size, mac_size, message_size, block_size); /* These are defined by the TLS RFC */ - stream_sizes->cbHeader = HEADER_SIZE_TLS; + stream_sizes->cbHeader = ctx->header_size; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; @@ -1367,7 +1388,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer = &message->pBuffers[idx]; buf_ptr = buffer->pvBuffer; - expected_size = HEADER_SIZE_TLS + read_record_size(buf_ptr, HEADER_SIZE_TLS); + expected_size = ctx->header_size + read_record_size(buf_ptr, ctx->header_size); if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); @@ -1384,7 +1405,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INCOMPLETE_MESSAGE; } - data_size = expected_size - HEADER_SIZE_TLS; + data_size = expected_size - ctx->header_size; data = heap_alloc(data_size); init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); @@ -1419,21 +1440,21 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %ld bytes\n", received); - memcpy(buf_ptr + HEADER_SIZE_TLS, data, received); + memcpy(buf_ptr + ctx->header_size, data, received); heap_free(data); schan_decrypt_fill_buffer(message, SECBUFFER_DATA, - buf_ptr + HEADER_SIZE_TLS, received); + buf_ptr + ctx->header_size, received); schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, - buf_ptr + HEADER_SIZE_TLS + received, buffer->cbBuffer - HEADER_SIZE_TLS - received); + buf_ptr + ctx->header_size + received, buffer->cbBuffer - ctx->header_size - received); if(buffer->cbBuffer > expected_size) schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, buf_ptr + expected_size, buffer->cbBuffer - expected_size); buffer->BufferType = SECBUFFER_STREAM_HEADER; - buffer->cbBuffer = HEADER_SIZE_TLS; + buffer->cbBuffer = ctx->header_size; return status; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e342df3874d..fbf9277a39c 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -50,6 +50,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); +/* Not present in gnutls version < 3.0. */ +static void (*pgnutls_transport_set_pull_timeout_function)(gnutls_session_t, + int (*)(gnutls_transport_ptr_t, unsigned int)); + /* Not present in gnutls version < 3.2.0. */ static int (*pgnutls_alpn_get_selected_protocol)(gnutls_session_t, gnutls_datum_t *); static int (*pgnutls_alpn_set_protocols)(gnutls_session_t, const gnutls_datum_t *, @@ -147,6 +151,12 @@ static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) } } +static void compat_gnutls_transport_set_pull_timeout_function(gnutls_session_t session, + int (*func)(gnutls_transport_ptr_t, unsigned int)) +{ + FIXME("\n"); +} + static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x509_privkey_t *key) { FIXME("\n"); @@ -212,6 +222,8 @@ static const struct { DWORD enable_flag; const char *gnutls_flag; } protocol_priority_flags[] = { + {SP_PROT_DTLS1_2_CLIENT, "VERS-DTLS1.2"}, + {SP_PROT_DTLS1_0_CLIENT, "VERS-DTLS1.0"}, {SP_PROT_TLS1_3_CLIENT, "VERS-TLS1.3"}, {SP_PROT_TLS1_2_CLIENT, "VERS-TLS1.2"}, {SP_PROT_TLS1_1_CLIENT, "VERS-TLS1.1"}, @@ -257,14 +269,29 @@ DWORD schan_imp_enabled_protocols(void) return supported_protocols; } +static int schan_pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) +{ + struct schan_transport *t = (struct schan_transport *)transport; + SIZE_T count = 0; + + if (schan_get_buffer(t, &t->in, &count)) return 1; + return 0; +} + BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; BOOL using_vers_all = FALSE, disabled; - unsigned i; + unsigned int i, flags = (cred->credential_use == SECPKG_CRED_INBOUND) ? GNUTLS_SERVER : GNUTLS_CLIENT; + int err; + + if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) + { + flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; + } - int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); + err = pgnutls_init(s, flags); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -315,6 +342,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre } pgnutls_transport_set_pull_function(*s, schan_pull_adapter); + if (flags & GNUTLS_DATAGRAM) pgnutls_transport_set_pull_timeout_function(*s, schan_pull_timeout); pgnutls_transport_set_push_function(*s, schan_push_adapter); return TRUE; @@ -400,6 +428,8 @@ static DWORD schannel_get_protocol(gnutls_protocol_t proto) case GNUTLS_TLS1_0: return SP_PROT_TLS1_0_CLIENT; case GNUTLS_TLS1_1: return SP_PROT_TLS1_1_CLIENT; case GNUTLS_TLS1_2: return SP_PROT_TLS1_2_CLIENT; + case GNUTLS_DTLS1_0: return SP_PROT_DTLS1_0_CLIENT; + case GNUTLS_DTLS1_2: return SP_PROT_DTLS1_2_CLIENT; default: FIXME("unknown protocol %d\n", proto); return 0; @@ -1085,6 +1115,11 @@ BOOL schan_imp_init(void) WARN("gnutls_cipher_get_block_size not found\n"); pgnutls_cipher_get_block_size = compat_cipher_get_block_size; } + if (!(pgnutls_transport_set_pull_timeout_function = dlsym(libgnutls_handle, "gnutls_transport_set_pull_timeout_function"))) + { + WARN("gnutls_transport_set_pull_timeout_function not found\n"); + pgnutls_transport_set_pull_timeout_function = compat_gnutls_transport_set_pull_timeout_function; + } if (!(pgnutls_alpn_set_protocols = dlsym(libgnutls_handle, "gnutls_alpn_set_protocols"))) { WARN("gnutls_alpn_set_protocols not found\n"); -- 2.30.1

1 0

[PATCH 2/5] secur32: Add a helper to read TLS record size.
by Hans Leidekker 10 Mar '21

10 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d47c4d79258..3a34007a8cb 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -772,6 +772,13 @@ static void dump_buffer_desc(SecBufferDesc *desc) } } +#define HEADER_SIZE_TLS 5 + +static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) +{ + return (buf[header_size - 2] << 8) | buf[header_size - 1]; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -870,9 +877,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ptr = buffer->pvBuffer; expected_size = 0; - while (buffer->cbBuffer > expected_size + 5) + while (buffer->cbBuffer > expected_size + HEADER_SIZE_TLS) { - record_size = 5 + ((ptr[3] << 8) | ptr[4]); + record_size = HEADER_SIZE_TLS + read_record_size(ptr, HEADER_SIZE_TLS); if (buffer->cbBuffer < expected_size + record_size) break; @@ -1035,7 +1042,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( mac_size, message_size, block_size); /* These are defined by the TLS RFC */ - stream_sizes->cbHeader = 5; + stream_sizes->cbHeader = HEADER_SIZE_TLS; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; @@ -1360,7 +1367,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer = &message->pBuffers[idx]; buf_ptr = buffer->pvBuffer; - expected_size = 5 + ((buf_ptr[3] << 8) | buf_ptr[4]); + expected_size = HEADER_SIZE_TLS + read_record_size(buf_ptr, HEADER_SIZE_TLS); if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); @@ -1377,7 +1384,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INCOMPLETE_MESSAGE; } - data_size = expected_size - 5; + data_size = expected_size - HEADER_SIZE_TLS; data = heap_alloc(data_size); init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); @@ -1412,21 +1419,21 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %ld bytes\n", received); - memcpy(buf_ptr + 5, data, received); + memcpy(buf_ptr + HEADER_SIZE_TLS, data, received); heap_free(data); schan_decrypt_fill_buffer(message, SECBUFFER_DATA, - buf_ptr + 5, received); + buf_ptr + HEADER_SIZE_TLS, received); schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, - buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + buf_ptr + HEADER_SIZE_TLS + received, buffer->cbBuffer - HEADER_SIZE_TLS - received); if(buffer->cbBuffer > expected_size) schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, buf_ptr + expected_size, buffer->cbBuffer - expected_size); buffer->BufferType = SECBUFFER_STREAM_HEADER; - buffer->cbBuffer = 5; + buffer->cbBuffer = HEADER_SIZE_TLS; return status; } -- 2.30.1

1 0