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

[PATCH vkd3d 3/8] vkd3d: Fix copying texture regions from textures to buffers.
by Józef Kucia 18 Mar '19

18 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: Fix the offset derived from src_box->front. Version 2: Take the block height into account. --- libs/vkd3d/command.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 157d5275667a..0ce540a7d8a7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2527,6 +2527,38 @@ static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, } } +static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy, + const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, + const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + VkDeviceSize row_count = footprint->Footprint.Height / format->block_height; + + copy->bufferOffset = footprint->Offset; + copy->bufferOffset += dst_x / format->block_width * format->byte_count * format->block_byte_count; + copy->bufferOffset += dst_y / format->block_height * footprint->Footprint.RowPitch; + copy->bufferOffset += dst_z * footprint->Footprint.RowPitch * row_count; + copy->bufferRowLength = footprint->Footprint.RowPitch / + (format->byte_count * format->block_byte_count) * format->block_width; + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, + format, sub_resource_idx, image_desc->MipLevels); + copy->imageOffset.x = src_box ? src_box->left : 0; + copy->imageOffset.y = src_box ? src_box->top : 0; + copy->imageOffset.z = src_box ? src_box->front : 0; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + unsigned int miplevel = copy->imageSubresource.mipLevel; + vk_extent_3d_from_d3d12_miplevel(&copy->imageExtent, image_desc, miplevel); + } +} + static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, unsigned int src_sub_resource_idx, unsigned int dst_sub_resource_idx, const D3D12_RESOURCE_DESC *src_desc, const D3D12_RESOURCE_DESC *dst_desc, @@ -2724,7 +2756,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); - vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, + vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, -- 2.19.2

2 1

[PATCH] mfplat/tests: Skip more tests on older systems.
by Nikolay Sivov 18 Mar '19

18 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- In attempt to get rid of crashes on XP, and occasionally on Vista. Patch applies on master as well as a part of earlier sent series of 6. dlls/mfplat/tests/mfplat.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b66c54a374..eb9e3b435c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1449,16 +1449,19 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul hr = IMFMediaEventQueue_GetEvent(queue, 0, &event); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Failed to get event, hr %#x.\n", hr); - } - hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); - ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); + hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); + ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); + + hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); + ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); + + IMFMediaEvent_Release(event); + } hr = IMFAsyncResult_GetObject(result, &obj); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - IMFMediaEvent_Release(event); - IMFMediaEventQueue_Release(queue); SetEvent(callback->event); -- 2.20.1

2 1

[PATCH 3/3] wined3d: Set 3D device caps in adapter_gl_get_wined3d_caps().
by Józef Kucia 18 Mar '19

18 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 7 +++++++ dlls/wined3d/directx.c | 10 ---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4b5445504295..b02241b7bb11 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4251,6 +4251,13 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + | WINEDDSCAPS_MIPMAP + | WINEDDSCAPS_TEXTURE + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_ZBUFFER; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d2e44f4955d5..debc4e5dc61f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2291,16 +2291,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in | WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VISIBLE; - if (!(wined3d->flags & WINED3D_NO3D)) - { - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE - | WINEDDSCAPS_MIPMAP - | WINEDDSCAPS_TEXTURE - | WINEDDSCAPS_VIDEOMEMORY - | WINEDDSCAPS_ZBUFFER; - caps->ddraw_caps.caps |= WINEDDCAPS_3D; - } - caps->shader_double_precision = d3d_info->shader_double_precision; caps->viewport_array_index_any_shader = d3d_info->viewport_array_index_any_shader; -- 2.19.2

2 1

[PATCH 2/3] wined3d: Make adapter partially responsible for filling wined3d caps.
by Józef Kucia 18 Mar '19

18 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 146 ++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 159 +++------------------------------ dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 2 +- 4 files changed, 162 insertions(+), 147 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e7dd0dac961d..4b5445504295 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4246,9 +4246,155 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } +static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) +{ + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) + caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP; + + if (gl_info->supported[WINED3D_GL_BLEND_EQUATION]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_BLENDOP; + if (gl_info->supported[EXT_BLEND_EQUATION_SEPARATE] && gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; + if (gl_info->supported[EXT_DRAW_BUFFERS2]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS; + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; + + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + { + caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY + | WINED3DPRASTERCAPS_ZBIAS + | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + } + + if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) + caps->DestBlendCaps |= WINED3DPBLENDCAPS_SRCALPHASAT; + + if (gl_info->supported[EXT_BLEND_COLOR]) + { + caps->SrcBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; + caps->DestBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; + } + + if (gl_info->supported[EXT_TEXTURE3D]) + { + caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP + | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; + if (!d3d_info->texture_npot) + caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; + } + + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + { + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP + | WINED3DPTEXTURECAPS_MIPCUBEMAP; + if (!d3d_info->texture_npot) + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; + } + + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + { + caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC + | WINED3DPTFILTERCAPS_MINFANISOTROPIC; + } + + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + { + caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR + | WINED3DPTFILTERCAPS_MAGFPOINT + | WINED3DPTFILTERCAPS_MINFLINEAR + | WINED3DPTFILTERCAPS_MINFPOINT + | WINED3DPTFILTERCAPS_MIPFLINEAR + | WINED3DPTFILTERCAPS_MIPFPOINT + | WINED3DPTFILTERCAPS_LINEAR + | WINED3DPTFILTERCAPS_LINEARMIPLINEAR + | WINED3DPTFILTERCAPS_LINEARMIPNEAREST + | WINED3DPTFILTERCAPS_MIPLINEAR + | WINED3DPTFILTERCAPS_MIPNEAREST + | WINED3DPTFILTERCAPS_NEAREST; + + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + { + caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC + | WINED3DPTFILTERCAPS_MINFANISOTROPIC; + } + } + + if (gl_info->supported[EXT_TEXTURE3D]) + { + caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR + | WINED3DPTFILTERCAPS_MAGFPOINT + | WINED3DPTFILTERCAPS_MINFLINEAR + | WINED3DPTFILTERCAPS_MINFPOINT + | WINED3DPTFILTERCAPS_MIPFLINEAR + | WINED3DPTFILTERCAPS_MIPFPOINT + | WINED3DPTFILTERCAPS_LINEAR + | WINED3DPTFILTERCAPS_LINEARMIPLINEAR + | WINED3DPTFILTERCAPS_LINEARMIPNEAREST + | WINED3DPTFILTERCAPS_MIPLINEAR + | WINED3DPTFILTERCAPS_MIPNEAREST + | WINED3DPTFILTERCAPS_NEAREST; + } + + if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) + { + caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; + } + if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) + { + caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; + } + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) + { + caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; + } + + if (gl_info->supported[EXT_TEXTURE3D]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_INDEPENDENTUV + | WINED3DPTADDRESSCAPS_CLAMP + | WINED3DPTADDRESSCAPS_WRAP; + + if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; + } + if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; + } + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; + } + } + + if (gl_info->supported[EXT_TEXTURE3D]) + caps->MaxVolumeExtent = gl_info->limits.texture3d_size; + + if (gl_info->supported[EXT_STENCIL_WRAP]) + { + caps->StencilCaps |= WINED3DSTENCILCAPS_DECR + | WINED3DSTENCILCAPS_INCR; + } + + if (gl_info->supported[WINED3D_GL_VERSION_2_0] + || gl_info->supported[EXT_STENCIL_TWO_SIDE] + || gl_info->supported[ATI_SEPARATE_STENCIL]) + { + caps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; + } + + caps->MaxAnisotropy = gl_info->limits.anisotropy; +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { wined3d_adapter_gl_create_context, + adapter_gl_get_wined3d_caps, }; BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d51e672a137e..d2e44f4955d5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1871,7 +1871,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap return WINED3D_OK; } -HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps) { const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; @@ -1895,8 +1895,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) - caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP; caps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | WINED3DCAPS3_COPY_TO_VIDMEM | @@ -1934,15 +1932,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS WINED3DPMISCCAPS_FOGVERTEXCLAMPED */ - if (gl_info->supported[WINED3D_GL_BLEND_EQUATION]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_BLENDOP; - if (gl_info->supported[EXT_BLEND_EQUATION_SEPARATE] && gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; - if (gl_info->supported[EXT_DRAW_BUFFERS2]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS; - if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; - caps->RasterCaps = WINED3DPRASTERCAPS_DITHER | WINED3DPRASTERCAPS_PAT | WINED3DPRASTERCAPS_WFOG | @@ -1956,13 +1945,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | WINED3DPRASTERCAPS_DEPTHBIAS; - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | - WINED3DPRASTERCAPS_ZBIAS | - WINED3DPRASTERCAPS_MIPMAPLODBIAS; - } - caps->ZCmpCaps = WINED3DPCMPCAPS_ALWAYS | WINED3DPCMPCAPS_EQUAL | WINED3DPCMPCAPS_GREATER | @@ -1999,16 +1981,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPBLENDCAPS_SRCCOLOR | WINED3DPBLENDCAPS_ZERO; - if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) - caps->DestBlendCaps |= WINED3DPBLENDCAPS_SRCALPHASAT; - - if (gl_info->supported[EXT_BLEND_COLOR]) - { - caps->SrcBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; - caps->DestBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; - } - - caps->AlphaCmpCaps = WINED3DPCMPCAPS_ALWAYS | WINED3DPCMPCAPS_EQUAL | WINED3DPCMPCAPS_GREATER | @@ -2042,22 +2014,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; } - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP - | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; - if (!d3d_info->texture_npot) - caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; - } - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP - | WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!d3d_info->texture_npot) - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; - } - caps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | WINED3DPTFILTERCAPS_MINFLINEAR | @@ -2071,97 +2027,14 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | - WINED3DPTFILTERCAPS_MINFANISOTROPIC; - } - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->CubeTextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MIPFLINEAR | - WINED3DPTFILTERCAPS_MIPFPOINT | - WINED3DPTFILTERCAPS_LINEAR | - WINED3DPTFILTERCAPS_LINEARMIPLINEAR | - WINED3DPTFILTERCAPS_LINEARMIPNEAREST | - WINED3DPTFILTERCAPS_MIPLINEAR | - WINED3DPTFILTERCAPS_MIPNEAREST | - WINED3DPTFILTERCAPS_NEAREST; - - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | - WINED3DPTFILTERCAPS_MINFANISOTROPIC; - } - } - else - { - caps->CubeTextureFilterCaps = 0; - } - - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->VolumeTextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MIPFLINEAR | - WINED3DPTFILTERCAPS_MIPFPOINT | - WINED3DPTFILTERCAPS_LINEAR | - WINED3DPTFILTERCAPS_LINEARMIPLINEAR | - WINED3DPTFILTERCAPS_LINEARMIPNEAREST | - WINED3DPTFILTERCAPS_MIPLINEAR | - WINED3DPTFILTERCAPS_MIPNEAREST | - WINED3DPTFILTERCAPS_NEAREST; - } - else - { - caps->VolumeTextureFilterCaps = 0; - } + caps->CubeTextureFilterCaps = 0; + caps->VolumeTextureFilterCaps = 0; caps->TextureAddressCaps = WINED3DPTADDRESSCAPS_INDEPENDENTUV | WINED3DPTADDRESSCAPS_CLAMP | WINED3DPTADDRESSCAPS_WRAP; - if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - { - caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; - } - if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) - { - caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; - } - if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) - { - caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; - } - - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->VolumeTextureAddressCaps = WINED3DPTADDRESSCAPS_INDEPENDENTUV | - WINED3DPTADDRESSCAPS_CLAMP | - WINED3DPTADDRESSCAPS_WRAP; - if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; - } - if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; - } - if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; - } - } - else - { - caps->VolumeTextureAddressCaps = 0; - } + caps->VolumeTextureAddressCaps = 0; caps->LineCaps = WINED3DLINECAPS_TEXTURE | WINED3DLINECAPS_ZTEST | @@ -2175,10 +2048,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxTextureWidth = d3d_info->limits.texture_size; caps->MaxTextureHeight = d3d_info->limits.texture_size; - if (gl_info->supported[EXT_TEXTURE3D]) - caps->MaxVolumeExtent = gl_info->limits.texture3d_size; - else - caps->MaxVolumeExtent = 0; + caps->MaxVolumeExtent = 0; caps->MaxTextureRepeat = 32768; caps->MaxTextureAspectRatio = d3d_info->limits.texture_size; @@ -2197,18 +2067,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DSTENCILCAPS_KEEP | WINED3DSTENCILCAPS_REPLACE | WINED3DSTENCILCAPS_ZERO; - if (gl_info->supported[EXT_STENCIL_WRAP]) - { - caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | - WINED3DSTENCILCAPS_INCR; - } - if (gl_info->supported[WINED3D_GL_VERSION_2_0] || gl_info->supported[EXT_STENCIL_TWO_SIDE] - || gl_info->supported[ATI_SEPARATE_STENCIL]) - { - caps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; - } - caps->MaxAnisotropy = gl_info->limits.anisotropy; + caps->MaxAnisotropy = 0; caps->MaxPointSize = d3d_info->limits.pointsize_max; caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ @@ -2446,6 +2306,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->max_feature_level = d3d_info->feature_level; + adapter->adapter_ops->adapter_get_wined3d_caps(adapter, caps); + return WINED3D_OK; } @@ -2491,9 +2353,14 @@ static BOOL wined3d_adapter_no3d_create_context(struct wined3d_context *context, return TRUE; } +static void adapter_no3d_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) +{ +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { wined3d_adapter_no3d_create_context, + adapter_no3d_get_wined3d_caps, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9bf579ec4613..a18e2ec0d91a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -73,6 +73,7 @@ #define WINED3D_QUIRK_BROKEN_ARB_FOG 0x00000200 struct fragment_pipeline; +struct wined3d_adapter; struct wined3d_context; struct wined3d_state; struct wined3d_texture_gl; @@ -2678,6 +2679,7 @@ struct wined3d_adapter_ops { BOOL (*adapter_create_context)(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format); + void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); }; BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2f8ed5efc77f..9e4eb8775673 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2206,7 +2206,7 @@ UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); -HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc); -- 2.19.2

2 1

[PATCH 1/3] wined3d: Pass swap interval to swapchain ops.
by Józef Kucia 18 Mar '19

18 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 3 +- dlls/wined3d/swapchain.c | 56 ++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 47b23de62fde..9960d06cea72 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -526,9 +526,8 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); - wined3d_swapchain_set_swap_interval(swapchain, op->swap_interval); - swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); wined3d_resource_release(&swapchain->front_buffer->resource); for (i = 0; i < swapchain->desc.backbuffer_count; ++i) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 724ea160c96d..c5060f93fc3a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -157,9 +157,9 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, { RECT s, d; - TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n", + TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, swap_interval %u, flags %#x.\n", swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), - dst_window_override, flags); + dst_window_override, swap_interval, flags); if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -348,6 +348,27 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, wined3d_texture_invalidate_location(texture, 0, WINED3D_LOCATION_DRAWABLE); } +static void swapchain_gl_set_swap_interval(struct wined3d_swapchain *swapchain, + struct wined3d_context *context, unsigned int swap_interval) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + swap_interval = swap_interval <= 4 ? swap_interval : 1; + if (swapchain->swap_interval == swap_interval) + return; + + swapchain->swap_interval = swap_interval; + + if (!gl_info->supported[WGL_EXT_SWAP_CONTROL]) + return; + + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + { + ERR("Failed to set swap interval %u for context %p, last error %#x.\n", + swap_interval, context, GetLastError()); + } +} + /* Context activation is done by the caller. */ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) { @@ -396,7 +417,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str } static void swapchain_gl_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; @@ -416,6 +437,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info = context->gl_info; + swapchain_gl_set_swap_interval(swapchain, context, swap_interval); + if ((logo_texture = swapchain->device->logo_texture)) { RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; @@ -597,7 +620,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai } static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { struct wined3d_dc_info *front, *back; HBITMAP bitmap; @@ -689,31 +712,6 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } -void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, - unsigned int swap_interval) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - swap_interval = swap_interval <= 4 ? swap_interval : 1; - if (swapchain->swap_interval == swap_interval) - return; - - swapchain->swap_interval = swap_interval; - - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); - gl_info = context->gl_info; - - if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) - { - if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) - ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x.\n", - swap_interval, context, GetLastError()); - } - - context_release(context); -} - static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e70010e74c94..9bf579ec4613 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4011,7 +4011,7 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, DWORD flags); + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags); void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); }; @@ -4049,8 +4049,6 @@ struct wined3d_swapchain }; void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; -void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, - unsigned int swap_interval) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH resend] winex11.drv/mouse: Use root-relative coordinates for events, if possible
by Gabriel Ivăncescu 18 Mar '19

18 Mar '19

Some applications control their own position when they are being moved. Since events' x and y fields are reported relative to the window, this can apparently result in them being out of sync from the X server side and ours (hwnd). This makes applications like Winamp go nuts when they are being moved and move all over the place "randomly" with some window managers. The solution is to use x_root and y_root instead, when the root is the same as our root_window, which solves this issue. The final coordinates will have to be relative to the virtual screen anyway, so this actually simplifies most of the code in send_mouse_input. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I don't know if the root_window check is needed. If it's not needed, then the code can be simplified considerably, and the map_to_root_coords helper function can be removed. Thoughts? dlls/winex11.drv/mouse.c | 100 ++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d678706..b12e214 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -554,6 +554,32 @@ static BOOL is_old_motion_event( unsigned long serial ) } +/*********************************************************************** + * map_to_root_coords + * + * Map the window-relative coordinates so they're relative to the root. + */ +static POINT map_to_root_coords(HWND hwnd, Window window, int x, int y) +{ + struct x11drv_win_data *data; + POINT pt = { x, y }; + + if (!(data = get_win_data(hwnd))) return pt; + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } + + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + release_win_data(data); + MapWindowPoints(hwnd, 0, &pt, 1); + + return pt; +} + + /*********************************************************************** * send_mouse_input * @@ -562,7 +588,6 @@ static BOOL is_old_motion_event( unsigned long serial ) static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; - POINT pt; input->type = INPUT_MOUSE; @@ -585,32 +610,14 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (window != root_window) - { - pt.x = input->u.mi.dx; - pt.y = input->u.mi.dy; - } - else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy ); - - if (!(data = get_win_data( hwnd ))) return; - - if (window == data->whole_window) - { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } - - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); - - if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || - input->u.mi.time - last_cursor_change > 100) + if ((InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || + input->u.mi.time - last_cursor_change > 100) && + (data = get_win_data( hwnd ))) { sync_window_cursor( data->whole_window ); last_cursor_change = input->u.mi.time; + release_win_data( data ); } - release_win_data( data ); if (hwnd != GetDesktopWindow()) { @@ -625,8 +632,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { - RECT rect; - SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); + RECT rect = { input->u.mi.dx, input->u.mi.dy, input->u.mi.dx + 1, input->u.mi.dy + 1 }; SERVER_START_REQ( update_window_zorder ) { @@ -640,8 +646,6 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU SERVER_END_REQ; } - input->u.mi.dx = pt.x; - input->u.mi.dy = pt.y; __wine_send_input( hwnd, input ); } @@ -1598,13 +1602,18 @@ BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; INPUT input; + POINT pt; if (buttonNum >= NB_BUTTONS) return FALSE; - TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, event->x, event->y ); + pt = root_to_virtual_screen(event->x_root, event->y_root); + if (event->root != root_window || !event->same_screen) + pt = map_to_root_coords(hwnd, event->window, event->x, event->y); + + TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, pt.x, pt.y ); - input.u.mi.dx = event->x; - input.u.mi.dy = event->y; + input.u.mi.dx = pt.x; + input.u.mi.dy = pt.y; input.u.mi.mouseData = button_down_data[buttonNum]; input.u.mi.dwFlags = button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); @@ -1624,13 +1633,18 @@ BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; INPUT input; + POINT pt; if (buttonNum >= NB_BUTTONS || !button_up_flags[buttonNum]) return FALSE; - TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, event->x, event->y ); + pt = root_to_virtual_screen(event->x_root, event->y_root); + if (event->root != root_window || !event->same_screen) + pt = map_to_root_coords(hwnd, event->window, event->x, event->y); + + TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, pt.x, pt.y ); - input.u.mi.dx = event->x; - input.u.mi.dy = event->y; + input.u.mi.dx = pt.x; + input.u.mi.dy = pt.y; input.u.mi.mouseData = button_up_data[buttonNum]; input.u.mi.dwFlags = button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); @@ -1648,12 +1662,17 @@ BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) { XMotionEvent *event = &xev->xmotion; INPUT input; + POINT pt; + + pt = root_to_virtual_screen(event->x_root, event->y_root); + if (event->root != root_window || !event->same_screen) + pt = map_to_root_coords(hwnd, event->window, event->x, event->y); TRACE( "hwnd %p/%lx pos %d,%d is_hint %d serial %lu\n", - hwnd, event->window, event->x, event->y, event->is_hint, event->serial ); + hwnd, event->window, pt.x, pt.y, event->is_hint, event->serial ); - input.u.mi.dx = event->x; - input.u.mi.dy = event->y; + input.u.mi.dx = pt.x; + input.u.mi.dy = pt.y; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); @@ -1676,6 +1695,7 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) { XCrossingEvent *event = &xev->xcrossing; INPUT input; + POINT pt; TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); @@ -1683,8 +1703,12 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; /* simulate a mouse motion event */ - input.u.mi.dx = event->x; - input.u.mi.dy = event->y; + pt = root_to_virtual_screen(event->x_root, event->y_root); + if (event->root != root_window || !event->same_screen) + pt = map_to_root_coords(hwnd, event->window, event->x, event->y); + + input.u.mi.dx = pt.x; + input.u.mi.dy = pt.y; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); -- 2.20.1

1 0

[PATCH] winex11: Forward all clipping requests to the right thread.
by Józef Kucia 18 Mar '19

18 Mar '19

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38087 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d6787068a965..f737a306a562 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -464,6 +464,8 @@ void reset_clipping_window(void) ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ } +BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); + /*********************************************************************** * clip_cursor_notify * @@ -492,12 +494,10 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) } else if (hwnd == GetForegroundWindow()) /* request to clip */ { - RECT clip, virtual_rect = get_virtual_screen_rect(); + RECT clip; GetClipCursor( &clip ); - if (clip.left > virtual_rect.left || clip.right < virtual_rect.right || - clip.top > virtual_rect.top || clip.bottom < virtual_rect.bottom) - return grab_clipping_window( &clip ); + X11DRV_ClipCursor( &clip ); } return 0; } @@ -1471,22 +1471,22 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (grab_pointer) { HWND foreground = GetForegroundWindow(); + DWORD tid, pid; + + /* forward request to the foreground window if it's in a different thread */ + tid = GetWindowThreadProcessId( foreground, &pid ); + if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + { + TRACE( "forwarding clip request to %p\n", foreground ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + return TRUE; + } /* we are clipping if the clip rectangle is smaller than the screen */ if (clip->left > virtual_rect.left || clip->right < virtual_rect.right || clip->top > virtual_rect.top || clip->bottom < virtual_rect.bottom) { - DWORD tid, pid; - - /* forward request to the foreground window if it's in a different thread */ - tid = GetWindowThreadProcessId( foreground, &pid ); - if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) - { - TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); - return TRUE; - } - else if (grab_clipping_window( clip )) return TRUE; + if (grab_clipping_window( clip )) return TRUE; } else /* if currently clipping, check if we should switch to fullscreen clipping */ { -- 2.19.2

1 0

[PATCH] ntoskrnl.exe: Make alloc_kernel_object() static.
by Francois Gouget 18 Mar '19

18 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e78e4595b3..62c188cfc18 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -264,7 +264,7 @@ static void free_kernel_object( void *obj ) HeapFree( GetProcessHeap(), 0, header ); } -void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) +static void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) { struct object_header *header; -- 2.20.1

3 4

[PATCH 1/6] mfplat: Implement Compare() for attributes.
by Nikolay Sivov 18 Mar '19

18 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 101 +++++++++++++++-- dlls/mfplat/tests/mfplat.c | 223 ++++++++++++++++++++++++++++++++++++- 2 files changed, 315 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 88945f6724..4589840c21 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -724,9 +724,24 @@ static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PR static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), type); + struct attributes *attributes = impl_from_IMFAttributes(iface); + struct attribute *attribute; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); + + EnterCriticalSection(&attributes->cs); + + if ((attribute = attributes_find_item(attributes, key, NULL))) + { + *type = attribute->value.vt; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); + + return hr; } static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) @@ -748,14 +763,86 @@ static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key return S_OK; } -static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, - BOOL *result) +static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes *theirs, + MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret) { - mfattributes *This = impl_from_IMFAttributes(iface); + struct attributes *attributes = impl_from_IMFAttributes(iface); + IMFAttributes *smaller, *other; + MF_ATTRIBUTE_TYPE type; + HRESULT hr = S_OK; + UINT32 count; + BOOL result; + size_t i; - FIXME("%p, %p, %d, %p\n", This, theirs, type, result); + TRACE("%p, %p, %d, %p.\n", iface, theirs, match_type, ret); - return E_NOTIMPL; + if (FAILED(hr = IMFAttributes_GetCount(theirs, &count))) + return hr; + + EnterCriticalSection(&attributes->cs); + + result = TRUE; + + switch (match_type) + { + case MF_ATTRIBUTES_MATCH_OUR_ITEMS: + for (i = 0; i < attributes->count; ++i) + { + if (FAILED(hr = IMFAttributes_CompareItem(theirs, &attributes->attributes[i].key, + &attributes->attributes[i].value, &result))) + break; + if (!result) + break; + } + break; + case MF_ATTRIBUTES_MATCH_THEIR_ITEMS: + hr = IMFAttributes_Compare(theirs, iface, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + break; + case MF_ATTRIBUTES_MATCH_ALL_ITEMS: + if (count != attributes->count) + { + result = FALSE; + break; + } + for (i = 0; i < count; ++i) + { + if (FAILED(hr = IMFAttributes_CompareItem(theirs, &attributes->attributes[i].key, + &attributes->attributes[i].value, &result))) + break; + if (!result) + break; + } + break; + case MF_ATTRIBUTES_MATCH_INTERSECTION: + for (i = 0; i < attributes->count; ++i) + { + if (FAILED(IMFAttributes_GetItemType(theirs, &attributes->attributes[i].key, &type))) + continue; + + if (FAILED(hr = IMFAttributes_CompareItem(theirs, &attributes->attributes[i].key, + &attributes->attributes[i].value, &result))) + break; + + if (!result) + break; + } + break; + case MF_ATTRIBUTES_MATCH_SMALLER: + smaller = attributes->count > count ? theirs : iface; + other = attributes->count > count ? iface : theirs; + hr = IMFAttributes_Compare(smaller, other, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + break; + default: + WARN("Unknown match type %d.\n", match_type); + hr = E_INVALIDARG; + } + + LeaveCriticalSection(&attributes->cs); + + if (SUCCEEDED(hr)) + *ret = result; + + return hr; } static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d9020..d012acc524 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -496,14 +496,27 @@ static void check_attr_count(IMFAttributes* obj, UINT32 expected, int line) ok_(__FILE__, line)(count == expected, "Unexpected count %u, expected %u.\n", count, expected); } -static void test_MFCreateAttributes(void) +#define CHECK_ATTR_TYPE(obj, key, expected) check_attr_type(obj, key, expected, __LINE__) +static void check_attr_type(IMFAttributes *obj, const GUID *key, MF_ATTRIBUTE_TYPE expected, int line) +{ + MF_ATTRIBUTE_TYPE type; + HRESULT hr; + + hr = IMFAttributes_GetItemType(obj, key, &type); + ok_(__FILE__, line)(hr == S_OK, "Failed to get item type, hr %#x.\n", hr); + ok_(__FILE__, line)(type == expected, "Unexpected item type %d, expected %d.\n", type, expected); +} + +static void test_attributes(void) { static const WCHAR stringW[] = {'W','i','n','e',0}; static const UINT8 blob[] = {0,1,2,3,4,5}; IMFAttributes *attributes, *attributes1; UINT8 blob_value[256], *blob_buf = NULL; + MF_ATTRIBUTES_MATCH_TYPE match_type; UINT32 value, string_length, size; PROPVARIANT propvar, ret_propvar; + MF_ATTRIBUTE_TYPE type; double double_value; IUnknown *unk_value; WCHAR bufferW[256]; @@ -516,10 +529,14 @@ static void test_MFCreateAttributes(void) hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_GetItemType(attributes, &GUID_NULL, &type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "Failed to set UINT32 value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 1); + CHECK_ATTR_TYPE(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, MF_ATTRIBUTE_UINT32); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value); @@ -534,6 +551,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "Failed to set UINT64 value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 1); + CHECK_ATTR_TYPE(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, MF_ATTRIBUTE_UINT64); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value64); ok(hr == S_OK, "Failed to get UINT64 value, hr %#x.\n", hr); @@ -643,6 +661,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetDouble(attributes, &GUID_NULL, 22.0); ok(hr == S_OK, "Failed to set double value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 3); + CHECK_ATTR_TYPE(attributes, &GUID_NULL, MF_ATTRIBUTE_DOUBLE); double_value = 0xdeadbeef; hr = IMFAttributes_GetDouble(attributes, &GUID_NULL, &double_value); @@ -664,6 +683,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetString(attributes, &DUMMY_GUID1, stringW); ok(hr == S_OK, "Failed to set string attribute, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 3); + CHECK_ATTR_TYPE(attributes, &DUMMY_GUID1, MF_ATTRIBUTE_STRING); hr = IMFAttributes_GetStringLength(attributes, &DUMMY_GUID1, &string_length); ok(hr == S_OK, "Failed to get string length, hr %#x.\n", hr); @@ -701,6 +721,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, (IUnknown *)attributes); ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 4); + CHECK_ATTR_TYPE(attributes, &DUMMY_GUID2, MF_ATTRIBUTE_IUNKNOWN); hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); ok(hr == S_OK, "Failed to get value, hr %#x.\n", hr); @@ -747,6 +768,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetBlob(attributes, &DUMMY_GUID1, blob, sizeof(blob)); ok(hr == S_OK, "Failed to set blob attribute, hr %#x.\n", hr); CHECK_ATTR_COUNT(attributes, 1); + CHECK_ATTR_TYPE(attributes, &DUMMY_GUID1, MF_ATTRIBUTE_BLOB); hr = IMFAttributes_GetBlobSize(attributes, &DUMMY_GUID1, &size); ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size == sizeof(blob), "Unexpected blob size %u.\n", size); @@ -779,6 +801,203 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); IMFAttributes_Release(attributes1); + + /* Compare() */ + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + hr = MFCreateAttributes(&attributes1, 0); + ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + + hr = IMFAttributes_Compare(attributes, attributes, MF_ATTRIBUTES_MATCH_SMALLER + 1, &result); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + for (match_type = MF_ATTRIBUTES_MATCH_OUR_ITEMS; match_type <= MF_ATTRIBUTES_MATCH_SMALLER; ++match_type) + { + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes, match_type, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, match_type, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + } + + hr = IMFAttributes_SetUINT32(attributes, &DUMMY_GUID1, 1); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + hr = IMFAttributes_SetUINT32(attributes1, &DUMMY_GUID1, 2); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + hr = IMFAttributes_SetUINT32(attributes1, &DUMMY_GUID1, 1); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + hr = IMFAttributes_SetUINT32(attributes1, &DUMMY_GUID2, 2); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes, attributes1, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_ALL_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_THEIR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = TRUE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(!result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_INTERSECTION, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + result = FALSE; + hr = IMFAttributes_Compare(attributes1, attributes, MF_ATTRIBUTES_MATCH_SMALLER, &result); + ok(hr == S_OK, "Failed to compare, hr %#x.\n", hr); + ok(result, "Unexpected result %d.\n", result); + + IMFAttributes_Release(attributes); + IMFAttributes_Release(attributes1); } static void test_MFCreateMFByteStreamOnStream(void) @@ -2112,7 +2331,7 @@ START_TEST(mfplat) test_register(); test_media_type(); test_MFCreateMediaEvent(); - test_MFCreateAttributes(); + test_attributes(); test_sample(); test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); -- 2.20.1

2 8

[PATCH 3/5] include: Introduce ascii_strncasecmp helper and use it in msvcrt.
by Piotr Caban 18 Mar '19

18 Mar '19

In tr_TR.UTF-8 locale tolower('I') != 'i' (this is not a bug in glibc, tolower('I') is suppossed to return dotless i that is 2-byte long). Because of that strcasemp("i", "I") returns that the strings are different. Another way of fixing it is to stop setting system locale for LC_CTYPE. Spotted by Jactry Zeng. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 13 +++++++------ dlls/msvcrt/mbcs.c | 5 +++-- dlls/msvcrt/string.c | 7 ++++--- include/wine/strings.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 include/wine/strings.h

2 1