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

[PATCH 3/5] wined3d: Store texture sub-resource buffer objects as uintptr_t.
by Henri Verbeet 03 Dec '19

03 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 17 ++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 976235bf60f..260a0486302 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -477,13 +477,15 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) { - GLuint *buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + uintptr_t *buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + GLuint bo; - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); + bo = *buffer_object; + GL_EXTCALL(glDeleteBuffers(1, &bo)); checkGLcall("glDeleteBuffers"); TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", - *buffer_object, texture, sub_resource_idx); + bo, texture, sub_resource_idx); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); *buffer_object = 0; @@ -1670,19 +1672,20 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) { struct wined3d_texture_sub_resource *sub_resource; + GLuint bo; sub_resource = &texture->sub_resources[sub_resource_idx]; if (sub_resource->buffer_object) return; - GL_EXTCALL(glGenBuffers(1, &sub_resource->buffer_object)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, sub_resource->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &bo)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo)); GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, sub_resource->size, NULL, GL_STREAM_DRAW)); GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("Create buffer object"); - TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", - sub_resource->buffer_object, texture, sub_resource_idx); + sub_resource->buffer_object = bo; + TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo, texture, sub_resource_idx); } static void wined3d_texture_force_reload(struct wined3d_texture *texture) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 67756a6bbfc..3754ed9e763 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3563,7 +3563,7 @@ struct wined3d_texture unsigned int map_count; uint32_t map_flags; DWORD locations; - GLuint buffer_object; + uintptr_t buffer_object; } *sub_resources; }; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Do not set depth/stencil sizes on colour formats.
by Henri Verbeet 03 Dec '19

03 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 41 ++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ac821ce732a..453bee62565 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -151,13 +151,13 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R32G32B32_TYPELESS, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, {WINED3DFMT_R16G16B16A16_TYPELESS, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, - {WINED3DFMT_R32G8X24_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 8, 32, 8}, + {WINED3DFMT_R32G8X24_TYPELESS, 32, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0}, {WINED3DFMT_R10G10B10A2_TYPELESS, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R10G10B10X2_TYPELESS, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, - {WINED3DFMT_R24G8_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, + {WINED3DFMT_R24G8_TYPELESS, 24, 8, 0, 0, 0, 0, 0, 0, 4, 0, 0}, {WINED3DFMT_R8G8_TYPELESS, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, {WINED3DFMT_R16_TYPELESS, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R8_TYPELESS, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -220,9 +220,9 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32G32_UINT, WINED3DFMT_R32G32_TYPELESS, "UU"}, {WINED3DFMT_R32G32_SINT, WINED3DFMT_R32G32_TYPELESS, "II"}, {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_R32G32_TYPELESS, "FF"}, - {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_R32G8X24_TYPELESS, "DX"}, - {WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "XS"}, - {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "DS"}, + {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_R32G8X24_TYPELESS, "FXX"}, + {WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "XUX"}, + {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32G8X24_TYPELESS, "DSX"}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, @@ -242,8 +242,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, - {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, - {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, + {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "uX"}, + {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XU"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, @@ -2099,6 +2099,12 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) format->depth_size = format->red_size; format->red_size = format->red_offset = 0; } + + if (channel_type == WINED3D_CHANNEL_TYPE_STENCIL && !format->stencil_size) + { + format->stencil_size = format->green_size; + format->green_size = format->green_offset = 0; + } } format->component_count = component_count; @@ -3785,27 +3791,24 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) + && typeless_depth_stencil_formats[i].separate_depth_view_format) { if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; - if (typeless_depth_stencil_formats[i].separate_depth_view_format) - { - copy_format(adapter, depth_view_format, ds_format); - depth_view_format->stencil_size = 0; - } - else - { - depth_view_format->depth_size = ds_format->depth_size; - } + copy_format(adapter, depth_view_format, ds_format); + depth_view_format->red_size = depth_view_format->depth_size; + depth_view_format->depth_size = 0; + depth_view_format->stencil_size = 0; } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(adapter, stencil_view_format, ds_format); - if (typeless_depth_stencil_formats[i].separate_depth_view_format) - stencil_view_format->depth_size = 0; + stencil_view_format->green_size = stencil_view_format->stencil_size; + stencil_view_format->depth_size = 0; + stencil_view_format->stencil_size = 0; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ee22808c1d..67756a6bbfc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5236,8 +5236,8 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { - return !srv_format || (srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) - || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); + return !srv_format || (srv_format->red_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Finish the CS before removing the context in adapter_vk_uninit_3d().
by Henri Verbeet 03 Dec '19

03 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21163a20949..4a501292824 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -466,6 +466,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) device->blitter->ops->blitter_destroy(device->blitter, NULL); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); device_context_remove(device, &context_vk->c); device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); -- 2.11.0

1 0

[PATCH v2 1/4] strmbase: Use a separate critical section for the SourceSeeking structure.
by Zebediah Figura 03 Dec '19

03 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/seeking.c | 53 +++++++++++++++++++-------------- dlls/winegstreamer/gstdemux.c | 5 ++-- dlls/wineqtdecoder/qtsplitter.c | 3 +- include/wine/strmbase.h | 7 +++-- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index 8a773b51d5..d87e4f8516 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* FIXME: critical sections */ #include "strmbase_private.h" @@ -29,7 +28,9 @@ static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) return CONTAINING_RECORD(iface, SourceSeeking, IMediaSeeking_iface); } -HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect) +HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, + SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, + SourceSeeking_ChangeRate fnChangeRate) { assert(fnChangeStop && fnChangeStart && fnChangeRate); @@ -48,10 +49,16 @@ HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtb pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - pSeeking->crst = crit_sect; + InitializeCriticalSection(&pSeeking->cs); + pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; } +void strmbase_seeking_cleanup(SourceSeeking *seeking) +{ + DeleteCriticalSection(&seeking->cs); +} + HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { SourceSeeking *This = impl_from_IMediaSeeking(iface); @@ -104,9 +111,9 @@ HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFo SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%s)\n", debugstr_guid(pFormat)); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pFormat = This->timeformat; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -118,10 +125,10 @@ HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const TRACE("(%s)\n", debugstr_guid(pFormat)); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); if (!IsEqualIID(pFormat, &This->timeformat)) hr = S_FALSE; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return hr; } @@ -140,9 +147,9 @@ HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * p TRACE("(%p)\n", pDuration); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pDuration = This->llDuration; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -153,9 +160,9 @@ HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG TRACE("(%p)\n", pStop); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pStop = This->llStop; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -167,9 +174,9 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL TRACE("(%p)\n", pCurrent); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pCurrent = This->llCurrent; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -214,7 +221,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * LONGLONG llNewCurrent, llNewStop; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags); @@ -233,7 +240,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * *pCurrent = llNewCurrent; if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); if (bChangeCurrent) This->fnChangeStart(iface); @@ -249,10 +256,10 @@ HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * TRACE("(%p, %p)\n", pCurrent, pStop); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); IMediaSeeking_GetCurrentPosition(iface, pCurrent); IMediaSeeking_GetStopPosition(iface, pStop); - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -263,10 +270,10 @@ HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * TRACE("(%p, %p)\n", pEarliest, pLatest); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pEarliest = 0; *pLatest = This->llDuration; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -285,11 +292,11 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) return VFW_E_UNSUPPORTED_AUDIO; } - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(iface); - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return hr; } @@ -300,10 +307,10 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) TRACE("(%p)\n", dRate); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); /* Forward? */ *dRate = This->dRate; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 479077b48f..5fa9d66c93 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1884,6 +1884,7 @@ static void free_source_pin(struct gstdemux_source *pin) FreeMediaType(&pin->mt); gst_segment_free(pin->segment); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); } @@ -1936,8 +1937,8 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * pin->segment = gst_segment_new(); gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; - SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, - GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); + strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, + GST_ChangeCurrent, GST_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); sprintf(pad_name, "qz_sink_%u", filter->cStreams); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index fbec10a912..81e18d3420 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -340,7 +340,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pInputPin.pin.peer = NULL; This->pInputPin.pin.pFuncsTable = &sink_ops; - SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); + strmbase_seeking_init(&This->sourceSeeking, &QT_Seeking_Vtbl, + QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); *phr = S_OK; return &This->filter.IUnknown_inner; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b08303f93d..7949e6670a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -272,10 +272,13 @@ typedef struct SourceSeeking double dRate; LONGLONG llCurrent, llStop, llDuration; GUID timeformat; - PCRITICAL_SECTION crst; + CRITICAL_SECTION cs; } SourceSeeking; -HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect); +HRESULT strmbase_seeking_init(SourceSeeking *seeking, const IMediaSeekingVtbl *vtbl, + SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, + SourceSeeking_ChangeRate fnChangeRate); +void strmbase_seeking_cleanup(SourceSeeking *seeking); HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); HRESULT WINAPI SourceSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); -- 2.24.0

2 5

[PATCH v3 1/4] strmbase: Use a separate critical section for the SourceSeeking structure.
by Zebediah Figura 03 Dec '19

03 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/seeking.c | 53 +++++++++++++++++++-------------- dlls/winegstreamer/gstdemux.c | 5 ++-- dlls/wineqtdecoder/qtsplitter.c | 3 +- include/wine/strmbase.h | 7 +++-- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index 8a773b51d5..d87e4f8516 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* FIXME: critical sections */ #include "strmbase_private.h" @@ -29,7 +28,9 @@ static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) return CONTAINING_RECORD(iface, SourceSeeking, IMediaSeeking_iface); } -HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect) +HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, + SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, + SourceSeeking_ChangeRate fnChangeRate) { assert(fnChangeStop && fnChangeStart && fnChangeRate); @@ -48,10 +49,16 @@ HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtb pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - pSeeking->crst = crit_sect; + InitializeCriticalSection(&pSeeking->cs); + pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; } +void strmbase_seeking_cleanup(SourceSeeking *seeking) +{ + DeleteCriticalSection(&seeking->cs); +} + HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { SourceSeeking *This = impl_from_IMediaSeeking(iface); @@ -104,9 +111,9 @@ HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFo SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%s)\n", debugstr_guid(pFormat)); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pFormat = This->timeformat; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -118,10 +125,10 @@ HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const TRACE("(%s)\n", debugstr_guid(pFormat)); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); if (!IsEqualIID(pFormat, &This->timeformat)) hr = S_FALSE; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return hr; } @@ -140,9 +147,9 @@ HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * p TRACE("(%p)\n", pDuration); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pDuration = This->llDuration; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -153,9 +160,9 @@ HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG TRACE("(%p)\n", pStop); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pStop = This->llStop; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -167,9 +174,9 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL TRACE("(%p)\n", pCurrent); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pCurrent = This->llCurrent; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -214,7 +221,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * LONGLONG llNewCurrent, llNewStop; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags); @@ -233,7 +240,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * *pCurrent = llNewCurrent; if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); if (bChangeCurrent) This->fnChangeStart(iface); @@ -249,10 +256,10 @@ HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * TRACE("(%p, %p)\n", pCurrent, pStop); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); IMediaSeeking_GetCurrentPosition(iface, pCurrent); IMediaSeeking_GetStopPosition(iface, pStop); - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -263,10 +270,10 @@ HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * TRACE("(%p, %p)\n", pEarliest, pLatest); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pEarliest = 0; *pLatest = This->llDuration; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -285,11 +292,11 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) return VFW_E_UNSUPPORTED_AUDIO; } - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(iface); - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return hr; } @@ -300,10 +307,10 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) TRACE("(%p)\n", dRate); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); /* Forward? */ *dRate = This->dRate; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 479077b48f..5fa9d66c93 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1884,6 +1884,7 @@ static void free_source_pin(struct gstdemux_source *pin) FreeMediaType(&pin->mt); gst_segment_free(pin->segment); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); } @@ -1936,8 +1937,8 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * pin->segment = gst_segment_new(); gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; - SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, - GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); + strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, + GST_ChangeCurrent, GST_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); sprintf(pad_name, "qz_sink_%u", filter->cStreams); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index fbec10a912..81e18d3420 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -340,7 +340,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pInputPin.pin.peer = NULL; This->pInputPin.pin.pFuncsTable = &sink_ops; - SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); + strmbase_seeking_init(&This->sourceSeeking, &QT_Seeking_Vtbl, + QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); *phr = S_OK; return &This->filter.IUnknown_inner; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b08303f93d..7949e6670a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -272,10 +272,13 @@ typedef struct SourceSeeking double dRate; LONGLONG llCurrent, llStop, llDuration; GUID timeformat; - PCRITICAL_SECTION crst; + CRITICAL_SECTION cs; } SourceSeeking; -HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect); +HRESULT strmbase_seeking_init(SourceSeeking *seeking, const IMediaSeekingVtbl *vtbl, + SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, + SourceSeeking_ChangeRate fnChangeRate); +void strmbase_seeking_cleanup(SourceSeeking *seeking); HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); HRESULT WINAPI SourceSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); -- 2.24.0

1 3

[PATCH v5 resend] user32: Send a WM_ACTIVATE message after restoring a minimized window.
by Zhiyi Zhang 03 Dec '19

03 Dec '19

The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window, and it's not from SetFocus(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 247 +++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 9 +- 2 files changed, 254 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0ba5834cf..78733f44c9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -892,6 +892,145 @@ static const struct message WmShowVisMaxPopupSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized window */ +static const struct message WmShowRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, WA_ACTIVE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to a minimized window */ +static const struct message WmShowNoActivateMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + /* Following optional messages are on XP/2003 */ + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + { HCBT_ACTIVATE, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam|optional, WA_ACTIVE }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message on XP even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to an active minimized window */ +static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE message even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to an active minimized window */ +static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Following optional messages are present on XP */ + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and with flag SW_SHOWNOACTIVATE */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; /* CreateWindow (for a child popup window, not initially visible) */ static const struct message WmCreateChildPopupSeq[] = { { HCBT_CREATEWND, hook }, @@ -4661,7 +4800,7 @@ static void test_scroll_messages(HWND hwnd) static void test_showwindow(void) { - HWND hwnd, hchild; + HWND hwnd, hwnd2, hchild; RECT rc; hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, @@ -4798,6 +4937,68 @@ static void test_showwindow(void) ok_sequence(WmShowVisMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); DestroyWindow(hwnd); flush_sequence(); + + /* Test 5: + * 1. Restoring a minimized window. + */ + hwnd = CreateWindowA("TestWindowClass", "window1", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + hwnd2 = CreateWindowA("static", "window2", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd2 != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): minimized overlapped", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); + + /* Test 6: + * 1. Restoring a minimized but active window. + */ + hwnd = CreateWindowA("TestWindowClass", "parent", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): active minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): active minimized overlapped", TRUE); + + DestroyWindow(hwnd); + flush_sequence(); } static void test_sys_menu(void) @@ -15521,6 +15722,42 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to an active minimized window */ +static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE messages even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15582,7 +15819,15 @@ static void test_defwinproc(void) DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); flush_events(); ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); flush_sequence(); + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); GetCursorPos(&pos); GetWindowRect(hwnd, &rect); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index aad5274973..7aca94e8fe 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1182,7 +1182,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) else WIN_ReleasePtr( wndPtr ); /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) SetFocus( hwnd ); + if (style & WS_MINIMIZE) + { + SetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_CHILD) && !(swp & SWP_NOACTIVATE)) + SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } done: SetThreadDpiAwarenessContext( context ); -- 2.24.0

1 0

[PATCH 3/3] user32/tests: Use a higher resolution in test_ChangeDisplaySettingsEx().
by Zhiyi Zhang 03 Dec '19

03 Dec '19

640x480 is not supported on some Windows 10 versions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix https://test.winehq.org/data/5536df1ee1042c6cf20a7d96c43520003a547092/win10… dlls/user32/tests/monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 4268dba9c5..567870e3d1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -234,20 +234,20 @@ struct vid_mode }; static const struct vid_mode vid_modes_test[] = { - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, - {640, 480, 0, 0, DM_BITSPERPEL , 0}, - {640, 480, 0, 0, DM_DISPLAYFREQUENCY, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, + {1024, 768, 0, 0, DM_BITSPERPEL , 0}, + {1024, 768, 0, 0, DM_DISPLAYFREQUENCY, 0}, {0, 0, 0, 0, DM_PELSWIDTH, 0}, {0, 0, 0, 0, DM_PELSHEIGHT, 0}, - {640, 480, 0, 0, DM_PELSWIDTH, 0}, - {640, 480, 0, 0, DM_PELSHEIGHT, 0}, - { 0, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, - {640, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH, 0}, + {1024, 768, 0, 0, DM_PELSHEIGHT, 0}, + { 0, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, + {1024, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, /* the following test succeeds under XP SP3 {0, 0, 0, 0, DM_DISPLAYFREQUENCY, 0} -- 2.24.0

1 0

[PATCH 2/3] user32/tests: Test cursor clip rectangles in per-monitor aware context.
by Zhiyi Zhang 03 Dec '19

03 Dec '19

So the tests don't fail in HiDPI environment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ca87a89deb..4268dba9c5 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -28,6 +28,7 @@ static HMODULE hdll; static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); +static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static void init_function_pointers(void) { @@ -39,6 +40,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetDisplayConfigBufferSizes) + GET_PROC(SetThreadDpiAwarenessContext) #undef GET_PROC } @@ -254,6 +256,7 @@ static const struct vid_mode vid_modes_test[] = { static void test_ChangeDisplaySettingsEx(void) { + DPI_AWARENESS_CONTEXT context = NULL; DEVMODEA dm; DEVMODEW dmW; DWORD width; @@ -328,6 +331,11 @@ static void test_ChangeDisplaySettingsEx(void) res == DISP_CHANGE_BADMODE /* XP SP3 */, "ChangeDisplaySettingsExW returned %d\n", res); + /* Test clip rectangle after resolution changes */ + /* GetClipCursor always returns result in physical pixels but GetSystemMetrics(SM_CX/CYVIRTUALSCREEN) are not. + * Set per-monitor aware context so that virtual screen rectangles are in physical pixels */ + if (pSetThreadDpiAwarenessContext) + context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -384,6 +392,8 @@ static void test_ChangeDisplaySettingsEx(void) ClipCursor(&virt); } } + if (pSetThreadDpiAwarenessContext && context) + pSetThreadDpiAwarenessContext(context); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); } -- 2.24.0

1 0

[PATCH 1/3] user32/tests: Import functions if possible.
by Zhiyi Zhang 03 Dec '19

03 Dec '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 126 +++++++++++------------------------- 1 file changed, 36 insertions(+), 90 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 04e63dc38d..ca87a89deb 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -27,15 +27,6 @@ #include <stdio.h> static HMODULE hdll; -static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); -static LONG (WINAPI *pChangeDisplaySettingsExW)(LPCWSTR, LPDEVMODEW, HWND, DWORD, LPVOID); -static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); -static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); -static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); -static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR,LPMONITORINFO); -static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); -static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); -static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); static void init_function_pointers(void) @@ -47,16 +38,7 @@ static void init_function_pointers(void) if(!p ## func) \ trace("GetProcAddress(%s) failed\n", #func); - GET_PROC(ChangeDisplaySettingsExA) - GET_PROC(ChangeDisplaySettingsExW) - GET_PROC(EnumDisplayDevicesA) - GET_PROC(EnumDisplayMonitors) GET_PROC(GetDisplayConfigBufferSizes) - GET_PROC(GetMonitorInfoA) - GET_PROC(GetMonitorInfoW) - GET_PROC(MonitorFromPoint) - GET_PROC(MonitorFromRect) - GET_PROC(MonitorFromWindow) #undef GET_PROC } @@ -69,7 +51,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, mi.cbSize = sizeof(mi); - ok(pGetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); + ok(GetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); if (mi.dwFlags & MONITORINFOF_PRIMARY) strcpy(primary, mi.szDevice); @@ -203,20 +185,14 @@ static void test_enumdisplaydevices(void) int monitor_index; BOOL ret; - if (!pEnumDisplayDevicesA) - { - win_skip("EnumDisplayDevicesA is not available\n"); - return; - } - /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); - ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); + ret = EnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) - for (adapter_index = 0; pEnumDisplayDevicesA(NULL, adapter_index, &dd, flags[flag_index]); adapter_index++) + for (adapter_index = 0; EnumDisplayDevicesA(NULL, adapter_index, &dd, flags[flag_index]); adapter_index++) { lstrcpyA(adapter_name, dd.DeviceName); @@ -228,7 +204,7 @@ static void test_enumdisplaydevices(void) test_enumdisplaydevices_adapter(adapter_index, &dd, flags[flag_index]); - for (monitor_index = 0; pEnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); + for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); monitor_index++) test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); } @@ -237,18 +213,12 @@ static void test_enumdisplaydevices(void) /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); - if (!pEnumDisplayMonitors || !pGetMonitorInfoA) - { - win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); - return; - } - - ret = pEnumDisplayDevicesA(NULL, 0, &dd, 0); + ret = EnumDisplayDevicesA(NULL, 0, &dd, 0); ok(ret, "Expect success\n"); lstrcpyA(primary_device_name, dd.DeviceName); primary_monitor_device_name[0] = 0; - ret = pEnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); + ret = EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); ok(ret, "EnumDisplayMonitors failed\n"); ok(!strcmp(primary_monitor_device_name, primary_device_name), "monitor device name %s, device name %s\n", primary_monitor_device_name, @@ -290,12 +260,6 @@ static void test_ChangeDisplaySettingsEx(void) LONG res; int i; - if (!pChangeDisplaySettingsExA) - { - win_skip("ChangeDisplaySettingsExA is not available\n"); - return; - } - SetLastError(0xdeadbeef); res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(res, "EnumDisplaySettings error %u\n", GetLastError()); @@ -311,7 +275,7 @@ static void test_ChangeDisplaySettingsEx(void) /* crashes under XP SP3 for large dmDriverExtra values */ dm.dmDriverExtra = 1; - res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); @@ -333,7 +297,7 @@ static void test_ChangeDisplaySettingsEx(void) /* Apparently XP treats dmDriverExtra being != 0 as an error */ dmW.dmDriverExtra = 1; - res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); + res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(res == DISP_CHANGE_SUCCESSFUL, @@ -347,7 +311,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; dm.dmPelsWidth = width; - res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_BADMODE || /* Win98, WinMe */ res == DISP_CHANGE_FAILED, /* NT4 */ @@ -357,7 +321,7 @@ static void test_ChangeDisplaySettingsEx(void) dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; dmW.dmPelsWidth = width; SetLastError(0xdeadbeef); - res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); + res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) ok(res == DISP_CHANGE_FAILED || res == DISP_CHANGE_BADPARAM || /* NT4 */ @@ -374,7 +338,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmBitsPerPel = vid_modes_test[i].bpp; dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; - res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || @@ -420,7 +384,7 @@ static void test_ChangeDisplaySettingsEx(void) ClipCursor(&virt); } } - res = pChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); } @@ -464,76 +428,64 @@ static void test_monitors(void) {0xdeadbeef, FALSE}, }; - if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) - { - win_skip("MonitorFromPoint, MonitorFromWindow, or MonitorFromRect is not available\n"); - return; - } - pt.x = pt.y = 0; - primary = pMonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); + primary = MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); ok( primary != 0, "couldn't get primary monitor\n" ); - monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONULL ); ok( !monitor, "got %p, should not get a monitor for an invalid window\n", monitor ); - monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary ); - monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); SetRect( &rc, 0, 0, 1, 1 ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); /* Empty rect at 0,0 is considered inside the primary monitor */ SetRect( &rc, 0, 0, -1, -1 ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); /* Even if there is a monitor left of the primary, the primary will have the most overlapping area */ SetRect( &rc, -1, 0, 2, 1 ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); /* But the width of the rect doesn't matter if it's empty. */ SetRect( &rc, -1, 0, 2, -1 ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); ok( monitor != primary, "got primary %p\n", monitor ); - if (!pGetMonitorInfoA) - { - win_skip("GetMonitorInfoA is not available\n"); - return; - } - /* Search for a monitor that has no others equally near to (left, top-1) */ SetRect( &rc, -1, -2, 2, 0 ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); nearest = primary; while (monitor != NULL) { ok( monitor != primary, "got primary %p\n", monitor ); nearest = monitor; mi.cbSize = sizeof(mi); - ret = pGetMonitorInfoA( monitor, &mi ); + ret = GetMonitorInfoA( monitor, &mi ); ok( ret, "GetMonitorInfo failed\n" ); SetRect( &rc, mi.rcMonitor.left-1, mi.rcMonitor.top-2, mi.rcMonitor.left+2, mi.rcMonitor.top ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); } /* tests for cbSize in MONITORINFO */ - monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); for (i = 0; i < ARRAY_SIZE(testdatami); i++) { memset( &mi, 0, sizeof(mi) ); mi.cbSize = testdatami[i].cbSize; - ret = pGetMonitorInfoA( monitor, &mi ); + ret = GetMonitorInfoA( monitor, &mi ); ok( ret == testdatami[i].ret, "GetMonitorInfo returned wrong value\n" ); if (ret) ok( (mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); @@ -542,7 +494,7 @@ static void test_monitors(void) memset( &miexw, 0, sizeof(miexw) ); miexw.cbSize = testdatamiexw[i].cbSize; - ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ret = GetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); if (ret) ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); @@ -555,7 +507,7 @@ static void test_monitors(void) { memset( &miexa, 0, sizeof(miexa) ); miexa.cbSize = testdatamiexa[i].cbSize; - ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miexa ); + ret = GetMonitorInfoA( monitor, (LPMONITORINFO)&miexa ); ok( ret == testdatamiexa[i].ret, "GetMonitorInfo returned wrong value\n" ); if (ret) ok( (miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); @@ -568,7 +520,7 @@ static void test_monitors(void) { memset( &miexw, 0, sizeof(miexw) ); miexw.cbSize = testdatamiexw[i].cbSize; - ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ret = GetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); if (ret) ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); @@ -578,13 +530,13 @@ static void test_monitors(void) SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); ok( monitor == NULL, "got %p\n", monitor ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTOPRIMARY ); ok( monitor == primary, "got %p, should get primary %p\n", monitor, primary ); - monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); + monitor = MonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); ok( monitor == nearest, "got %p, should get nearest %p\n", monitor, nearest ); } @@ -594,7 +546,7 @@ static BOOL CALLBACK find_primary_mon(HMONITOR hmon, HDC hdc, LPRECT rc, LPARAM BOOL ret; mi.cbSize = sizeof(mi); - ret = pGetMonitorInfoA(hmon, &mi); + ret = GetMonitorInfoA(hmon, &mi); ok(ret, "GetMonitorInfo failed\n"); if (mi.dwFlags & MONITORINFOF_PRIMARY) { @@ -613,19 +565,13 @@ static void test_work_area(void) WINDOWPLACEMENT wp; BOOL ret; - if (!pEnumDisplayMonitors || !pGetMonitorInfoA) - { - win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); - return; - } - hmon = 0; - ret = pEnumDisplayMonitors(NULL, NULL, find_primary_mon, (LPARAM)&hmon); + ret = EnumDisplayMonitors(NULL, NULL, find_primary_mon, (LPARAM)&hmon); ok(!ret && hmon != 0, "Failed to find primary monitor\n"); mi.cbSize = sizeof(mi); SetLastError(0xdeadbeef); - ret = pGetMonitorInfoA(hmon, &mi); + ret = GetMonitorInfoA(hmon, &mi); ok(ret, "GetMonitorInfo error %u\n", GetLastError()); ok(mi.dwFlags & MONITORINFOF_PRIMARY, "not a primary monitor\n"); trace("primary monitor %s\n", wine_dbgstr_rect(&mi.rcMonitor)); -- 2.24.0

1 0

[PATCH 1/5] ucrtbase: Improve strftime special test cases for %c %r formats.
by Jeff Smith 03 Dec '19

03 Dec '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 083be42f42..606e74b524 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -29,6 +29,7 @@ #include <fcntl.h> #include <time.h> #include <direct.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -162,6 +163,7 @@ static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p__Strftime)(char*, size_t, const char*, const struct tm*, void*); +static char* (__cdecl *p_setlocale)(int, const char*); static struct tm* (__cdecl *p__gmtime32)(const __time32_t*); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); @@ -538,6 +540,7 @@ static BOOL init(void) p_asctime = (void*)GetProcAddress(module, "asctime"); p_strftime = (void*)GetProcAddress(module, "strftime"); p__Strftime = (void*)GetProcAddress(module, "_Strftime"); + p_setlocale = (void*)GetProcAddress(module, "setlocale"); p__gmtime32 = (void*)GetProcAddress(module, "_gmtime32"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); @@ -1135,6 +1138,8 @@ static void test_strftime(void) struct tm tm_yweek = { 0, 0, 0, 1, 0, 70, 0, 0, 0 }; char buf[256]; int i, ret=0; + char expected[] = "01/01/1970 00:00:00"; + const char *locale; for (i=0; i<ARRAY_SIZE(tests); i++) { @@ -1185,6 +1190,16 @@ static void test_strftime(void) i, j, buf, tests_yweek[i].ret[j]); } } + + locale = p_setlocale(LC_ALL, NULL); + p_setlocale(LC_ALL, "fr-FR"); + ret = p_strftime(buf, sizeof(buf), "%c", &epoch); + ok(ret == strlen(expected), "ret = %d\n", ret); + ok(!strcmp(buf, expected), "buf = \"%s\", expected \"%s\"\n", buf, expected); + ret = p_strftime(buf, sizeof(buf), "%x %r", &epoch); + todo_wine ok(ret == strlen(expected), "ret = %d\n", ret); + todo_wine ok(!strcmp(buf, expected), "buf = \"%s\", expected \"%s\"\n", buf, expected); + p_setlocale(LC_ALL, locale); } static LONG* get_failures_counter(HANDLE *map) -- 2.23.0

2 7