September 2020 - Wine-devel

[PATCH vkd3d 4/4] vkd3d-shader: Use proper variables for epilogue arguments.
by Henri Verbeet 04 Sep '20

04 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5781ce18..999abd68 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6877,14 +6877,22 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxb { if (compiler->private_output_variable[i]) { + uint32_t argument_id = compiler->private_output_variable[i]; unsigned int argument_idx = count++; - arguments[argument_idx] = compiler->private_output_variable[i]; if (compiler->private_output_variable_array_idx[i]) { - arguments[argument_idx] = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, - arguments[argument_idx], compiler->private_output_variable_array_idx[i]); + uint32_t tmp_id; + + tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + argument_id, compiler->private_output_variable_array_idx[i]); + tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); + argument_id = vkd3d_spirv_build_op_variable(builder, + &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); + vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); } + + arguments[argument_idx] = argument_id; } } -- 2.11.0

1 0

[PATCH vkd3d 3/4] vkd3d-shader: Do not use built-ins for hull shader clip/cull distance built-ins.
by Henri Verbeet 04 Sep '20

04 Sep '20

We need these to be per-vertex. This fixes the Wine d3d11 test_clip_distance() test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 78cfd2ae..5781ce18 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4977,9 +4977,11 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp } if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) + { vkd3d_spirv_builder_begin_main_function(builder); - vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + } } static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) -- 2.11.0

1 0

[PATCH vkd3d 2/4] vkd3d-shader: Enable the corresponding capabilities when using the clip/cull distance built-ins.
by Henri Verbeet 04 Sep '20

04 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb251a45..78cfd2ae 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3559,6 +3559,12 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com case SpvBuiltInSampleId: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); break; + case SpvBuiltInClipDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityClipDistance); + break; + case SpvBuiltInCullDistance: + vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); + break; default: break; } -- 2.11.0

1 0

[PATCH vkd3d 1/4] vkd3d-shader: Add some TRACEs.
by Henri Verbeet 04 Sep '20

04 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e3abaf7c..3c2de057 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -294,6 +294,8 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ void vkd3d_shader_free_messages(char *messages) { + TRACE("messages %p.\n", messages); + vkd3d_free(messages); } @@ -912,11 +914,15 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { + TRACE("scan_descriptor_info %p.\n", scan_descriptor_info); + vkd3d_free(scan_descriptor_info->descriptors); } void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { + TRACE("shader_code %p.\n", shader_code); + vkd3d_free((void *)shader_code->code); } @@ -956,6 +962,8 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_sign void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *desc) { + TRACE("desc %p.\n", desc); + if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) { vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); -- 2.11.0

1 0

[PATCH vkd3d v2 5/5] include: Document vkd3d_shader_signature.
by Zebediah Figura 04 Sep '20

04 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix copy/paste error include/vkd3d_shader.h | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2a2c960a..37525404 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -962,29 +962,50 @@ struct vkd3d_shader_scan_descriptor_info unsigned int descriptor_count; }; +/** + * Data type of a shader varying, returned as part of struct + * vkd3d_shader_signature_element. + */ enum vkd3d_shader_component_type { + /** The varying has no type. */ VKD3D_SHADER_COMPONENT_VOID = 0x0, + /** 32-bit unsigned integer. */ VKD3D_SHADER_COMPONENT_UINT = 0x1, + /** 32-bit signed integer. */ VKD3D_SHADER_COMPONENT_INT = 0x2, + /** 32-bit IEEE floating-point. */ VKD3D_SHADER_COMPONENT_FLOAT = 0x3, + /** Boolean. */ VKD3D_SHADER_COMPONENT_BOOL = 0x4, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPONENT_TYPE), }; +/** System value semantic, returned as part of struct vkd3d_shader_signature. */ enum vkd3d_shader_sysval_semantic { + /** No system value. */ VKD3D_SHADER_SV_NONE = 0x00, + /** Vertex position; SV_Position in Direct3D. */ VKD3D_SHADER_SV_POSITION = 0x01, + /** Clip distance; SV_ClipDistance in Direct3D. */ VKD3D_SHADER_SV_CLIP_DISTANCE = 0x02, + /** Cull distance; SV_CullDistance in Direct3D. */ VKD3D_SHADER_SV_CULL_DISTANCE = 0x03, + /** Render target layer; SV_RenderTargetArrayIndex in Direct3D. */ VKD3D_SHADER_SV_RENDER_TARGET_ARRAY_INDEX = 0x04, + /** Viewport index; SV_ViewportArrayIndex in Direct3D. */ VKD3D_SHADER_SV_VIEWPORT_ARRAY_INDEX = 0x05, + /** Vertex ID; SV_VertexID in Direct3D. */ VKD3D_SHADER_SV_VERTEX_ID = 0x06, + /** Primtive ID; SV_PrimitiveID in Direct3D. */ VKD3D_SHADER_SV_PRIMITIVE_ID = 0x07, + /** Instance ID; SV_InstanceID in Direct3D. */ VKD3D_SHADER_SV_INSTANCE_ID = 0x08, + /** Whether the triangle is front-facing; SV_IsFrontFace in Direct3D. */ VKD3D_SHADER_SV_IS_FRONT_FACE = 0x09, + /** Sample index; SV_SampleIndex in Direct3D. */ VKD3D_SHADER_SV_SAMPLE_INDEX = 0x0a, VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE = 0x0b, VKD3D_SHADER_SV_TESS_FACTOR_QUADINT = 0x0c, @@ -996,32 +1017,66 @@ enum vkd3d_shader_sysval_semantic VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), }; +/** + * Minimum interpolation precision of a shader varying, returned as part of + * struct vkd3d_shader_signature_element. + */ enum vkd3d_shader_minimum_precision { VKD3D_SHADER_MINIMUM_PRECISION_NONE = 0, + /** 16-bit floating-point. */ VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_16 = 1, + /** 10-bit fixed point (2 integer and 8 fractional bits). */ VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, + /** 16-bit signed integer. */ VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, + /** 16-bit unsigned integer. */ VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_MINIMUM_PRECISION), }; +/** + * A single shader varying, returned as part of struct vkd3d_shader_signature. + */ struct vkd3d_shader_signature_element { + /** Semantic name. */ const char *semantic_name; + /** Semantic index, or 0 if the semantic is not indexed. */ unsigned int semantic_index; + /** + * Stream index of a geometry shader output semantic. If the signature is + * not a geometry shader output signature, this field will be set to 0. + */ unsigned int stream_index; + /** + * System value semantic. If the varying is not a system value, this field + * will be set to VKD3D_SHADER_SV_NONE. + */ enum vkd3d_shader_sysval_semantic sysval_semantic; + /** Data type. */ enum vkd3d_shader_component_type component_type; + /** Register index. */ unsigned int register_index; + /** Register mask. */ unsigned int mask; + /** Minimum interpolation precision. */ enum vkd3d_shader_minimum_precision min_precision; }; +/** + * Description of a shader input or output signature. This structure is + * populated by vkd3d_shader_parse_input_signature(). + * + * The helper function vkd3d_shader_find_signature_element() will look up a + * varying element by its semantic name, semantic index, and stream index. + */ struct vkd3d_shader_signature { + /** Pointer to an array of varyings. */ struct vkd3d_shader_signature_element *elements; + /** Size, in elements, of \ref elements. */ unsigned int element_count; }; -- 2.28.0

2 1

[PATCH] evr: Create and initialize mixer transform attributes.
by Nikolay Sivov 04 Sep '20

04 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 28 +++++++++++++++++++++++----- dlls/evr/tests/evr.c | 24 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d92bb6c1704..d9f86a7fc91 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -70,11 +70,9 @@ struct video_mixer struct output_stream output; COLORREF bkgnd_color; - IDirect3DDeviceManager9 *device_manager; - IMediaEventSink *event_sink; - + IMFAttributes *attributes; CRITICAL_SECTION cs; }; @@ -246,6 +244,8 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) video_mixer_clear_types(mixer); if (mixer->device_manager) IDirect3DDeviceManager9_Release(mixer->device_manager); + if (mixer->attributes) + IMFAttributes_Release(mixer->attributes); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -360,9 +360,17 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStreamInfo(IMFTransform *if static HRESULT WINAPI video_mixer_transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) { - FIXME("%p, %p.\n", iface, attributes); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, attributes); + + if (!attributes) + return E_POINTER; + + *attributes = mixer->attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, @@ -1317,6 +1325,8 @@ HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID ri HRESULT evr_mixer_create(IUnknown *outer, void **out) { struct video_mixer *object; + MFVideoNormalizedRect rect; + HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1335,6 +1345,14 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->input_count = 1; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + IMFAttributes_SetBlob(object->attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&rect, sizeof(rect)); *out = &object->IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6a5d80df416..ba97eba53d1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -419,6 +419,7 @@ static void test_default_mixer(void) DWORD input_count, output_count; IMFVideoProcessor *processor; IMFVideoDeviceID *deviceid; + MFVideoNormalizedRect rect; DWORD input_id, output_id; IMFTransform *transform; DXVA2_ValueRange range; @@ -508,6 +509,29 @@ todo_wine hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetAttributes(transform, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetAttributes(transform, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetAttributes(transform, &attributes2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(attributes == attributes2, "Unexpected attributes instance.\n"); + IMFAttributes_Release(attributes2); + + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + memset(&rect, 0, sizeof(rect)); + hr = IMFAttributes_GetBlob(attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&rect, sizeof(rect), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rect.left == 0.0f && rect.top == 0.0f && rect.right == 1.0f && rect.bottom == 1.0f, + "Unexpected zoom rect (%f, %f) - (%f, %f).\n", rect.left, rect.top, rect.right, rect.bottom); + + IMFAttributes_Release(attributes); + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 0

[PATCH 2/2] ddraw: Report correct frequency in GetDisplayMode().
by Zhiyi Zhang 04 Sep '20

04 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 2 -- dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d7545e5c82c..c3c335d978e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1652,7 +1652,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; - DDSD->u2.dwRefreshRate = 60; + DDSD->u2.dwRefreshRate = mode.refresh_rate; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6f0948bbaba..2fac4d4b0ba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13865,7 +13865,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index abcd2010b23..6b584798539 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14763,7 +14763,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -14796,7 +14795,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 071acbacedc..d438132764f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17824,7 +17824,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -17857,7 +17856,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0f87d46ec09..288624728f2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18086,7 +18086,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -18119,7 +18118,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, -- 2.25.1

3 2

[PATCH 1/2] ddraw/tests: Add display mode frequency tests.
by Zhiyi Zhang 04 Sep '20

04 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 41 +++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 85 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 85 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 85 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 293 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 532065a4796..6f0948bbaba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13837,7 +13837,48 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + DEVMODEW devmode; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + IDirectDraw_Release(ddraw); } START_TEST(ddraw1) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 800dab0fe83..abcd2010b23 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14495,8 +14495,11 @@ struct find_different_mode_param { unsigned int old_width; unsigned int old_height; + unsigned int old_frequency; unsigned int new_width; unsigned int new_height; + unsigned int new_frequency; + unsigned int new_bpp; }; static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc, void *context) @@ -14506,10 +14509,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; - if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) + if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && + surface_desc->dwRefreshRate != param->old_frequency) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; return DDENUMRET_CANCEL; } @@ -14722,7 +14728,84 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + struct find_different_mode_param param; + DDSURFACEDESC surface_desc; + IDirectDraw2 *ddraw; + DEVMODEW devmode; + HWND window; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + memset(&param, 0, sizeof(param)); + param.old_frequency = surface_desc.dwRefreshRate; + hr = IDirectDraw2_EnumDisplayModes(ddraw, DDEDM_REFRESHRATES, NULL, &param, + find_different_mode_callback); + ok(hr == DD_OK, "EnumDisplayModes failed, hr %#x.\n", hr); + if (!param.new_frequency) + { + skip("Failed to find a display mode with a different frequency.\n"); + goto done; + } + + hr = IDirectDraw2_SetDisplayMode(ddraw, param.new_width, param.new_height, param.new_bpp, + param.new_frequency, 0); + ok(hr == DD_OK, "SetDisplayMode failed, hr %#x.\n", hr); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == param.new_width, "Expected width %u, got %u.\n", param.new_width, + surface_desc.dwWidth); + ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, + surface_desc.dwHeight); + todo_wine + ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", + param.new_frequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + +done: + DestroyWindow(window); + IDirectDraw2_Release(ddraw); } START_TEST(ddraw2) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d4f4f08e396..071acbacedc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17556,8 +17556,11 @@ struct find_different_mode_param { unsigned int old_width; unsigned int old_height; + unsigned int old_frequency; unsigned int new_width; unsigned int new_height; + unsigned int new_frequency; + unsigned int new_bpp; }; static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_desc, void *context) @@ -17567,10 +17570,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; - if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) + if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && + surface_desc->dwRefreshRate != param->old_frequency) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; return DDENUMRET_CANCEL; } @@ -17783,7 +17789,84 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + struct find_different_mode_param param; + DDSURFACEDESC2 surface_desc; + IDirectDraw4 *ddraw; + DEVMODEW devmode; + HWND window; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + memset(&param, 0, sizeof(param)); + param.old_frequency = surface_desc.dwRefreshRate; + hr = IDirectDraw4_EnumDisplayModes(ddraw, DDEDM_REFRESHRATES, NULL, &param, + find_different_mode_callback); + ok(hr == DD_OK, "EnumDisplayModes failed, hr %#x.\n", hr); + if (!param.new_frequency) + { + skip("Failed to find a display mode with a different frequency.\n"); + goto done; + } + + hr = IDirectDraw4_SetDisplayMode(ddraw, param.new_width, param.new_height, param.new_bpp, + param.new_frequency, 0); + ok(hr == DD_OK, "SetDisplayMode failed, hr %#x.\n", hr); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == param.new_width, "Expected width %u, got %u.\n", param.new_width, + surface_desc.dwWidth); + ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, + surface_desc.dwHeight); + todo_wine + ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", + param.new_frequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + +done: + DestroyWindow(window); + IDirectDraw4_Release(ddraw); } START_TEST(ddraw4) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5ea81903c47..0f87d46ec09 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17818,8 +17818,11 @@ struct find_different_mode_param { unsigned int old_width; unsigned int old_height; + unsigned int old_frequency; unsigned int new_width; unsigned int new_height; + unsigned int new_frequency; + unsigned int new_bpp; }; static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_desc, void *context) @@ -17829,10 +17832,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; - if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) + if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && + surface_desc->dwRefreshRate != param->old_frequency) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; return DDENUMRET_CANCEL; } @@ -18045,7 +18051,84 @@ static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *m static void test_get_display_mode(void) { + static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; + struct find_different_mode_param param; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + DEVMODEW devmode; + HWND window; + HRESULT hr; + BOOL ret; + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwSize == sizeof(surface_desc), "Expected dwSize %u, got %u.\n", + sizeof(surface_desc), surface_desc.dwSize); + ok(surface_desc.dwFlags == flags, "Expected dwFlags %#x, got %#x.\n", flags, + surface_desc.dwFlags); + ok(surface_desc.dwWidth == devmode.dmPelsWidth, "Expected width %u, got %u.\n", + devmode.dmPelsWidth, surface_desc.dwWidth); + ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", + devmode.dmPelsHeight, surface_desc.dwHeight); + todo_wine_if(devmode.dmDisplayFrequency != 60) + ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", + devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), + "Expected ddpfPixelFormat.dwSize %u, got %u.\n", sizeof(surface_desc.ddpfPixelFormat), + surface_desc.ddpfPixelFormat.dwSize); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == devmode.dmBitsPerPel, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + ok(surface_desc.lPitch == devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + "Expected pitch %u, got %u.\n", devmode.dmPelsWidth * devmode.dmBitsPerPel / 8, + surface_desc.lPitch); + + memset(&param, 0, sizeof(param)); + param.old_frequency = surface_desc.dwRefreshRate; + hr = IDirectDraw7_EnumDisplayModes(ddraw, DDEDM_REFRESHRATES, NULL, &param, + find_different_mode_callback); + ok(hr == DD_OK, "EnumDisplayModes failed, hr %#x.\n", hr); + if (!param.new_frequency) + { + skip("Failed to find a display mode with a different frequency.\n"); + goto done; + } + + hr = IDirectDraw7_SetDisplayMode(ddraw, param.new_width, param.new_height, param.new_bpp, + param.new_frequency, 0); + ok(hr == DD_OK, "SetDisplayMode failed, hr %#x.\n", hr); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == param.new_width, "Expected width %u, got %u.\n", param.new_width, + surface_desc.dwWidth); + ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, + surface_desc.dwHeight); + todo_wine + ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", + param.new_frequency, surface_desc.dwRefreshRate); + ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, + "Expected ddpfPixelFormat.dwRGBBitCount %u, got %u.\n", devmode.dmBitsPerPel, + surface_desc.ddpfPixelFormat.dwRGBBitCount); + +done: + DestroyWindow(window); + IDirectDraw7_Release(ddraw); } START_TEST(ddraw7) -- 2.25.1

3 2

[PATCH vkd3d v2 1/5] include: Document vkd3d-shader swizzles.
by Zebediah Figura 04 Sep '20

04 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/vkd3d_shader.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 16db0283..044eeb99 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -961,7 +961,7 @@ struct vkd3d_shader_signature unsigned int element_count; }; -/* swizzle bits fields: wwzzyyxx */ +/** Possible values for a single component of a vkd3d-shader swizzle. */ enum vkd3d_shader_swizzle_component { VKD3D_SHADER_SWIZZLE_X = 0x0, @@ -972,17 +972,33 @@ enum vkd3d_shader_swizzle_component VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), }; +/** + * A mask selecting one component from a vkd3d-shader swizzle. The component has + * type \ref vkd3d_shader_swizzle_component. + */ #define VKD3D_SHADER_SWIZZLE_MASK (0xffu) +/** The offset, in bits, of the nth parameter of a vkd3d-shader swizzle. */ #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (8u * (idx)) +/** + * A helper macro which returns a vkd3d-shader swizzle with the given + * components. The components are specified as the suffixes to members of + * \ref vkd3d_shader_swizzle_component. For example, the swizzle ".xwyy" can be + * represented as: + * \code + * VKD3D_SHADER_SWIZZLE(X, W, Y, Y) + * \endcode + */ #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ vkd3d_shader_create_swizzle(VKD3D_SHADER_SWIZZLE_ ## x, \ VKD3D_SHADER_SWIZZLE_ ## y, \ VKD3D_SHADER_SWIZZLE_ ## z, \ VKD3D_SHADER_SWIZZLE_ ## w) +/** The identity swizzle ".xyzw". */ #define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) +/** Build a vkd3d-shader swizzle with the given components. */ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_component x, enum vkd3d_shader_swizzle_component y, enum vkd3d_shader_swizzle_component z, enum vkd3d_shader_swizzle_component w) -- 2.28.0

3 9

[PATCH v2 1/6] msscript.ocx/tests: Add tests for SitehWnd.
by Gabriel Ivăncescu 04 Sep '20

04 Sep '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/tests/msscript.c | 161 +++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2e7f14d..5a29c7e 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1905,6 +1905,166 @@ static void test_AllowUI(void) IScriptControl_Release(sc); } +static void test_SitehWnd(void) +{ + IScriptControl *sc; + LONG site_hwnd; + HRESULT hr; + HWND hwnd; + BSTR str; + + hwnd = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, 50, 50, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create window, error %08x\n", GetLastError()); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 1); + todo_wine ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"vbscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + IActiveScriptSiteWindow *site_window; + HWND window; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteWindow, (void**)&site_window); + ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0; + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); + todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + site_hwnd = 0xdeadbeef; + hr = IScriptControl_put_SitehWnd(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + + window = (HWND)0xdeadbeef; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!window, "got %p\n", window); + + site_hwnd = 0; + hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(!window, "got %p\n", window); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + window = NULL; + hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + + IActiveScriptSiteWindow_Release(site_window); + } + + DestroyWindow(hwnd); +} + static void test_UseSafeSubset(void) { IScriptControl *sc; @@ -4100,6 +4260,7 @@ START_TEST(msscript) test_Reset(); test_AddObject(); test_AllowUI(); + test_SitehWnd(); test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); -- 2.21.0

2 11