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

[PATCH 3/5] riched20: Explicitly select the background brush.
by Huw Davies March 23, 2021

March 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index bdf129b80a0..0d9916cd206 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -32,6 +32,9 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_Cell *cell; int ys, ye; HRGN oldRgn; + HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( editor->texthost, COLOR_WINDOW ) ); + + ME_InitContext( &c, editor, hDC ); oldRgn = CreateRectRgn(0, 0, 0, 0); if (!GetClipRgn(hDC, oldRgn)) @@ -42,7 +45,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectClipRect(hDC, rcUpdate->left, rcUpdate->top, rcUpdate->right, rcUpdate->bottom); - ME_InitContext(&c, editor, hDC); + brush = SelectObject( hDC, brush ); SetBkMode(hDC, TRANSPARENT); para = editor_first_para( editor ); @@ -89,6 +92,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) editor->nLastTotalLength = editor->nTotalLength; editor->nLastTotalWidth = editor->nTotalWidth; + DeleteObject( SelectObject( hDC, brush ) ); SelectClipRgn(hDC, oldRgn); if (oldRgn) DeleteObject(oldRgn); -- 2.23.0

1 0

[PATCH 2/5] riched20: Call OnTxInPlaceActivate() from the host.
by Huw Davies March 23, 2021

March 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 2 +- dlls/riched20/txtsrv.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c1f175dc9c2..cda9b35b199 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1021,7 +1021,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LONG codepage = unicode ? CP_UNICODE : CP_ACP; int len; - ITextServices_OnTxPropertyBitsChange( host->text_srv, TXTBIT_CLIENTRECTCHANGE, 0 ); + ITextServices_OnTxInPlaceActivate( host->text_srv, NULL ); if (lparam) { diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7bdd6ab924b..bab52269db6 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -220,6 +220,7 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c if (!client) { + if (!services->editor->in_place_active) return E_INVALIDARG; hr = ITextHost_TxGetClientRect( services->host, &rect ); client = &rect; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Don't release the dc when destroying the context.
by Huw Davies March 23, 2021

March 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 +++- dlls/riched20/context.c | 1 - dlls/riched20/paint.c | 1 - dlls/riched20/para.c | 4 +++- dlls/riched20/run.c | 8 ++++++-- dlls/riched20/wrap.c | 5 ++++- dlls/riched20/writer.c | 5 ++++- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 96765cba25d..1f4c3903a38 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -227,12 +227,13 @@ void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, ME_Run *size_run = run, *prev; ME_Context c; int run_x; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); assert(~para->nFlags & MEPF_REWRAP); row = row_from_cursor( cursor ); - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ME_InitContext( &c, editor, hdc ); if (!cursor->nOffset && (prev = run_prev( run ))) size_run = prev; @@ -243,6 +244,7 @@ void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, *y = c.rcView.top + para->pt.y + row->nBaseline + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); return; } diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 66066b39e67..24592cff10c 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -44,5 +44,4 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) void ME_DestroyContext(ME_Context *c) { select_style( c, NULL ); - if (c->hDC) ITextHost_TxReleaseDC( c->editor->texthost, c->hDC ); } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1c957e46ee2..bdf129b80a0 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -93,7 +93,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) if (oldRgn) DeleteObject(oldRgn); - c.hDC = NULL; ME_DestroyContext(&c); } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 29624e6c1df..78148ae7793 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -160,8 +160,9 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Run *run; ME_Style *style; int eol_len; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ME_InitContext( &c, editor, hdc ); hf = GetStockObject(SYSTEM_FONT); assert(hf); @@ -221,6 +222,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, para ); ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); } static void para_mark_rewrap_paras( ME_TextEditor *editor, ME_Paragraph *first, const ME_Paragraph *end ) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index bc282b20a57..51e768f8441 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -571,10 +571,12 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B { ME_Context c; int ret; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); - ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + ME_InitContext( &c, editor, hdc ); ret = ME_CharFromPointContext( &c, cx, run, closest, visual_order ); ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; } @@ -648,10 +650,12 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu { ME_Context c; int ret; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ME_InitContext( &c, editor, hdc ); ret = ME_PointFromCharContext( &c, pRun, nOffset, visual_order ); ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index dcda041d773..3d7e030fe50 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1027,10 +1027,12 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; struct repaint_range repaint = { NULL, NULL }; + HDC hdc; if (!editor->marked_paras.root) return FALSE; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + hdc = ITextHost_TxGetDC( editor->texthost ); + ME_InitContext( &c, editor, hdc ); entry = wine_rb_head( editor->marked_paras.root ); while (entry) @@ -1085,6 +1087,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) editor->nTotalWidth = totalWidth; ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) para_range_invalidate( editor, repaint.start, repaint.end); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 50eccfa714b..7c7e648f107 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -939,11 +939,13 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, UINT size; SIZE goal, pic; ME_Context c; + HDC hdc; hr = IOleObject_QueryInterface( run->reobj->obj.poleobj, &IID_IDataObject, (void **)&data ); if (FAILED(hr)) return FALSE; - ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + hdc = ITextHost_TxGetDC( editor->texthost ); + ME_InitContext( &c, editor, hdc ); hr = IDataObject_QueryGetData( data, &fmt ); if (hr != S_OK) goto done; @@ -985,6 +987,7 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, done: ME_DestroyContext( &c ); + ITextHost_TxReleaseDC( editor->texthost, hdc ); HeapFree( GetProcessHeap(), 0, emf_bits ); ReleaseStgMedium( &med ); IDataObject_Release( data ); -- 2.23.0

1 0

[PATCH 1/2] wined3d: Rename create/destroy helpers dealing with Vulkan objects.
by Jan Sikorski March 23, 2021

March 23, 2021

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 8 +++---- dlls/wined3d/context_vk.c | 38 +++++++++++++++++----------------- dlls/wined3d/device.c | 22 ++++++++++---------- dlls/wined3d/texture.c | 8 +++---- dlls/wined3d/view.c | 22 ++++++++++---------- dlls/wined3d/wined3d_private.h | 12 +++++------ 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 973aebac9fa..b784be6ab04 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1330,7 +1330,7 @@ static void wined3d_view_vk_destroy_object(void *object) { if (context) { - wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context), + wined3d_context_vk_destroy_vk_buffer_view(wined3d_context_vk(context), *ctx->vk_buffer_view, *ctx->command_buffer_id); } else @@ -1343,7 +1343,7 @@ static void wined3d_view_vk_destroy_object(void *object) { if (context) { - wined3d_context_vk_destroy_image_view(wined3d_context_vk(context), + wined3d_context_vk_destroy_vk_image_view(wined3d_context_vk(context), *ctx->vk_image_view, *ctx->command_buffer_id); } else @@ -1358,7 +1358,7 @@ static void wined3d_view_vk_destroy_object(void *object) { if (context) { - wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context), + wined3d_context_vk_destroy_vk_buffer_view(wined3d_context_vk(context), *ctx->vk_counter_view, *ctx->command_buffer_id); } else @@ -1556,7 +1556,7 @@ static void wined3d_sampler_vk_destroy_object(void *object) context_vk = wined3d_context_vk(context_acquire(sampler_vk->s.device, NULL, 0)); - wined3d_context_vk_destroy_sampler(context_vk, sampler_vk->vk_image_info.sampler, sampler_vk->command_buffer_id); + wined3d_context_vk_destroy_vk_sampler(context_vk, sampler_vk->vk_image_info.sampler, sampler_vk->command_buffer_id); heap_free(sampler_vk); context_release(&context_vk->c); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b27b9e3b0c6..88a20f979ed 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -520,7 +520,7 @@ static struct wined3d_retired_object_vk *wined3d_context_vk_get_retired_object_v return &retired->objects[retired->count++]; } -void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *context_vk, VkFramebuffer vk_framebuffer, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -545,7 +545,7 @@ void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_v o->command_buffer_id = command_buffer_id; } -static void wined3d_context_vk_destroy_descriptor_pool(struct wined3d_context_vk *context_vk, +static void wined3d_context_vk_destroy_vk_descriptor_pool(struct wined3d_context_vk *context_vk, VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -570,7 +570,7 @@ static void wined3d_context_vk_destroy_descriptor_pool(struct wined3d_context_vk o->command_buffer_id = command_buffer_id; } -void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -668,7 +668,7 @@ static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk * o->command_buffer_id = command_buffer_id; } -static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context_vk, +static void wined3d_context_vk_destroy_vk_buffer(struct wined3d_context_vk *context_vk, VkBuffer vk_buffer, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -693,7 +693,7 @@ static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context o->command_buffer_id = command_buffer_id; } -void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_image(struct wined3d_context_vk *context_vk, VkImage vk_image, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -718,7 +718,7 @@ void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, o->command_buffer_id = command_buffer_id; } -void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_buffer_view(struct wined3d_context_vk *context_vk, VkBufferView vk_view, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -743,7 +743,7 @@ void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_v o->command_buffer_id = command_buffer_id; } -void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_image_view(struct wined3d_context_vk *context_vk, VkImageView vk_view, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -768,7 +768,7 @@ void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk o->command_buffer_id = command_buffer_id; } -void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk, VkSampler vk_sampler, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -812,7 +812,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const return; } - wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); + wined3d_context_vk_destroy_vk_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { if (bo->map_ptr) @@ -823,7 +823,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); - wined3d_context_vk_destroy_memory(context_vk, bo->vk_memory, bo->command_buffer_id); + wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) @@ -1196,7 +1196,7 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte if (context_vk->vk_framebuffer) { - wined3d_context_vk_destroy_framebuffer(context_vk, + wined3d_context_vk_destroy_vk_framebuffer(context_vk, context_vk->vk_framebuffer, context_vk->current_command_buffer.id); context_vk->vk_framebuffer = VK_NULL_HANDLE; } @@ -2305,7 +2305,7 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(vk_command_buffer, first, count, buffers, offsets, sizes)); } -static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_vk *device_vk, +static VkResult wined3d_context_vk_create_vk_descriptor_pool(struct wined3d_device_vk *device_vk, const struct wined3d_vk_info *vk_info, VkDescriptorPool *vk_pool) { struct VkDescriptorPoolCreateInfo pool_desc; @@ -2334,7 +2334,7 @@ static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_ return vr; } -static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_vk *context_vk, +static VkResult wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -2342,7 +2342,7 @@ static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_ struct VkDescriptorSetAllocateInfo set_desc; VkResult vr; - if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_descriptor_pool(device_vk, + if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool))) { WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -2359,10 +2359,10 @@ static VkResult wined3d_context_vk_create_descriptor_set(struct wined3d_context_ if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY) { - wined3d_context_vk_destroy_descriptor_pool(context_vk, + wined3d_context_vk_destroy_vk_descriptor_pool(context_vk, context_vk->vk_descriptor_pool, context_vk->current_command_buffer.id); context_vk->vk_descriptor_pool = VK_NULL_HANDLE; - if ((vr = wined3d_context_vk_create_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool))) + if ((vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool))) { WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); return vr; @@ -2505,7 +2505,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; } - if ((vr = wined3d_context_vk_create_descriptor_set(context_vk, vk_set_layout, &vk_descriptor_set))) + if ((vr = wined3d_context_vk_create_vk_descriptor_set(context_vk, vk_set_layout, &vk_descriptor_set))) { WARN("Failed to create descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); return false; @@ -2641,7 +2641,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return true; } -static VkResult wined3d_context_vk_create_descriptor_set_layout(struct wined3d_device_vk *device_vk, +static VkResult wined3d_context_vk_create_vk_descriptor_set_layout(struct wined3d_device_vk *device_vk, const struct wined3d_vk_info *vk_info, const struct wined3d_pipeline_layout_key_vk *key, VkDescriptorSetLayout *vk_set_layout) { @@ -2687,7 +2687,7 @@ struct wined3d_pipeline_layout_vk *wined3d_context_vk_get_pipeline_layout( memcpy(layout->key.bindings, key.bindings, sizeof(*layout->key.bindings) * key.binding_count); layout->key.binding_count = key.binding_count; - if ((vr = wined3d_context_vk_create_descriptor_set_layout(device_vk, vk_info, &key, &layout->vk_set_layout))) + if ((vr = wined3d_context_vk_create_vk_descriptor_set_layout(device_vk, vk_info, &key, &layout->vk_set_layout))) { WARN("Failed to create descriptor set layout, vr %s.\n", wined3d_debug_vkresult(vr)); goto fail; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5ff11f15b13..bbf1bada7b6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -584,11 +584,11 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device, stru static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk, uint64_t command_buffer_id) { - wined3d_context_vk_destroy_image(context_vk, image->vk_image, command_buffer_id); + wined3d_context_vk_destroy_vk_image(context_vk, image->vk_image, command_buffer_id); if (image->memory) wined3d_context_vk_destroy_allocator_block(context_vk, image->memory, command_buffer_id); else - wined3d_context_vk_destroy_memory(context_vk, image->vk_memory, command_buffer_id); + wined3d_context_vk_destroy_vk_memory(context_vk, image->vk_memory, command_buffer_id); } static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk, @@ -934,16 +934,16 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_cube.imageView, id); - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id); - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); - wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms_array.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_cube.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_3d.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_1d.imageView, id); - wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); - wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_uint, id); + wined3d_context_vk_destroy_vk_buffer_view(context_vk, v->vk_view_buffer_float, id); + wined3d_context_vk_destroy_vk_buffer_view(context_vk, v->vk_view_buffer_uint, id); } HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 74dda1df09f..0b64cc3f03d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5154,20 +5154,20 @@ static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture, case WINED3D_LOCATION_TEXTURE_RGB: if (texture_vk->default_image_info.imageView) { - wined3d_context_vk_destroy_image_view(context_vk, + wined3d_context_vk_destroy_vk_image_view(context_vk, texture_vk->default_image_info.imageView, texture_vk->command_buffer_id); texture_vk->default_image_info.imageView = VK_NULL_HANDLE; } if (texture_vk->vk_image) { - wined3d_context_vk_destroy_image(context_vk, texture_vk->vk_image, texture_vk->command_buffer_id); + wined3d_context_vk_destroy_vk_image(context_vk, texture_vk->vk_image, texture_vk->command_buffer_id); texture_vk->vk_image = VK_NULL_HANDLE; if (texture_vk->memory) wined3d_context_vk_destroy_allocator_block(context_vk, texture_vk->memory, texture_vk->command_buffer_id); else - wined3d_context_vk_destroy_memory(context_vk, + wined3d_context_vk_destroy_vk_memory(context_vk, texture_vk->vk_memory, texture_vk->command_buffer_id); texture_vk->vk_memory = VK_NULL_HANDLE; texture_vk->memory = NULL; @@ -6270,7 +6270,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk VK_CALL(vkCmdEndRenderPass(vk_command_buffer)); } - wined3d_context_vk_destroy_framebuffer(context_vk, vk_framebuffer, context_vk->current_command_buffer.id); + wined3d_context_vk_destroy_vk_framebuffer(context_vk, vk_framebuffer, context_vk->current_command_buffer.id); for (i = 0; i < rt_count; ++i) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cd13da02078..a1780e8e242 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -656,7 +656,7 @@ VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, } } -static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk *context_vk, +static VkBufferView wined3d_view_vk_create_vk_buffer_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_buffer_vk *buffer_vk, const struct wined3d_format_vk *view_format_vk) { @@ -688,7 +688,7 @@ static VkBufferView wined3d_view_vk_create_buffer_view(struct wined3d_context_vk return vk_buffer_view; } -static VkImageView wined3d_view_vk_create_texture_view(struct wined3d_context_vk *context_vk, +static VkImageView wined3d_view_vk_create_vk_image_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv) { @@ -826,7 +826,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object) } context = context_acquire(resource->device, NULL, 0); - view_vk->vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), + view_vk->vk_image_view = wined3d_view_vk_create_vk_image_view(wined3d_context_vk(context), desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true); context_release(context); @@ -1040,8 +1040,8 @@ void wined3d_shader_resource_view_vk_update(struct wined3d_shader_resource_view_ VkBufferView vk_buffer_view; buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); - wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); - if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + wined3d_context_vk_destroy_vk_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) { view_vk->u.vk_buffer_view = vk_buffer_view; view_vk->bo_user.valid = true; @@ -1071,7 +1071,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); context = context_acquire(resource->device, NULL, 0); - vk_buffer_view = wined3d_view_vk_create_buffer_view(wined3d_context_vk(context), + vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(wined3d_context_vk(context), desc, buffer_vk, wined3d_format_vk(format)); context_release(context); @@ -1105,7 +1105,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) FIXME("Swapchain shader resource views not supported.\n"); context = context_acquire(resource->device, NULL, 0); - vk_image_view = wined3d_view_vk_create_texture_view(wined3d_context_vk(context), + vk_image_view = wined3d_view_vk_create_vk_image_view(wined3d_context_vk(context), desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false); context_release(context); @@ -1721,8 +1721,8 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie VkBufferView vk_buffer_view; buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); - wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); - if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + wined3d_context_vk_destroy_vk_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) { view_vk->u.vk_buffer_view = vk_buffer_view; view_vk->bo_user.valid = true; @@ -1760,7 +1760,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); vk_info = context_vk->vk_info; - if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, format_vk))) + if ((vk_buffer_view = wined3d_view_vk_create_vk_buffer_view(context_vk, desc, buffer_vk, format_vk))) { TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); @@ -1829,7 +1829,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) FIXME("Swapchain unordered access views not supported.\n"); context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - vk_image_view = wined3d_view_vk_create_texture_view(context_vk, desc, + vk_image_view = wined3d_view_vk_create_vk_image_view(context_vk, desc, texture_vk, format_vk, format_vk->f.color_fixup, false); context_release(&context_vk->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0df57a91049..85b29efbb91 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2600,17 +2600,17 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte struct wined3d_allocator_block *block, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; -void wined3d_context_vk_destroy_buffer_view(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_buffer_view(struct wined3d_context_vk *context_vk, VkBufferView vk_view, uint64_t command_buffer_id) DECLSPEC_HIDDEN; -void wined3d_context_vk_destroy_framebuffer(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *context_vk, VkFramebuffer vk_framebuffer, uint64_t command_buffer_id) DECLSPEC_HIDDEN; -void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_image(struct wined3d_context_vk *context_vk, VkImage vk_image, uint64_t command_buffer_id) DECLSPEC_HIDDEN; -void wined3d_context_vk_destroy_image_view(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_image_view(struct wined3d_context_vk *context_vk, VkImageView vk_view, uint64_t command_buffer_id) DECLSPEC_HIDDEN; -void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; -void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk, VkSampler vk_sampler, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -- 2.31.0

2 2

[PATCH] msvcrtd/tests: Missing the library should be a win_skip().
by Francois Gouget March 23, 2021

March 23, 2021

Wine is supposed to have msvcrtd and we want its absence to be recorded as a skip either way. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/msvcrtd/tests/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 4af4c815b38..2a232de4a49 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -42,7 +42,7 @@ static BOOL init_functions(void) HMODULE hModule = LoadLibraryA("msvcrtd.dll"); if (!hModule) { - trace("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError()); + win_skip("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError()); return FALSE; } -- 2.20.1

2 1

Re: [PATCH] msvcrtd/tests: Missing the library should be a win_skip().
by Piotr Caban March 23, 2021

March 23, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

Re: TestBot job 87490 results: [PATCH 3/5] include: Add missing items_size parameter to GetMany.
by Rémi Bernon March 23, 2021

March 23, 2021

On 3/23/21 10:13 AM, Marvin wrote: > VM Status Failures Command > build success > w2008s64 success 0 windows.gaming.input_test.exe input > w7u_2qxl success 0 windows.gaming.input_test.exe input > w7u_adm success 0 windows.gaming.input_test.exe input > w7u_el success 0 windows.gaming.input_test.exe input > w8 success 0 windows.gaming.input_test.exe input > w8adm success 0 windows.gaming.input_test.exe input > w864 success 0 windows.gaming.input_test.exe input > w1064v1507 failed 1 windows.gaming.input_test.exe input > w1064v1809 failed 2 windows.gaming.input_test.exe input > w1064 failed 2 windows.gaming.input_test.exe input > w10pro64 failed 2 windows.gaming.input_test.exe input > wvistau64 success 0 windows.gaming.input_test64.exe input > w2008s64 success 0 windows.gaming.input_test64.exe input > w864 success 0 windows.gaming.input_test64.exe input > w1064v1507 failed 1 windows.gaming.input_test64.exe input > w1064v1809 failed 2 windows.gaming.input_test64.exe input > w1064 failed 2 windows.gaming.input_test64.exe input > w1064_2qxl failed 2 windows.gaming.input_test64.exe input > w10pro64 failed 2 windows.gaming.input_test64.exe input > w10pro64_ar failed 2 windows.gaming.input_test64.exe input > w10pro64_he failed 2 windows.gaming.input_test64.exe input > w10pro64_ja failed 2 windows.gaming.input_test64.exe input > w10pro64_zh_CN failed 2 windows.gaming.input_test64.exe input > w2008s64 success 0 windows.media.speech_test.exe speech > w7u_2qxl success 0 windows.media.speech_test.exe speech > w7u_adm success 0 windows.media.speech_test.exe speech > w7u_el success 0 windows.media.speech_test.exe speech > w8 success 0 windows.media.speech_test.exe speech > w8adm success 0 windows.media.speech_test.exe speech > w864 success 0 windows.media.speech_test.exe speech > w1064v1507 success 0 windows.media.speech_test.exe speech > w1064v1809 success 0 windows.media.speech_test.exe speech > w1064 success 0 windows.media.speech_test.exe speech > w10pro64 success 0 windows.media.speech_test.exe speech > wvistau64 success 0 windows.media.speech_test64.exe speech > w2008s64 success 0 windows.media.speech_test64.exe speech > w864 success 0 windows.media.speech_test64.exe speech > w1064v1507 success 0 windows.media.speech_test64.exe speech > w1064v1809 success 0 windows.media.speech_test64.exe speech > w1064 success 0 windows.media.speech_test64.exe speech > w1064_2qxl success 0 windows.media.speech_test64.exe speech > w10pro64 success 0 windows.media.speech_test64.exe speech > w10pro64_ar success 0 windows.media.speech_test64.exe speech > w10pro64_he success 0 windows.media.speech_test64.exe speech > w10pro64_ja success 0 windows.media.speech_test64.exe speech > w10pro64_zh_CN success 0 windows.media.speech_test64.exe speech > debiant2 success 0 > debiant2 success 0 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=87490 > > > === w1064v1507 (32 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > > === w1064v1809 (32 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w1064 (32 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w10pro64 (32 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w1064v1507 (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > > === w1064v1809 (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w1064 (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w1064_2qxl (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w10pro64 (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w10pro64_ar (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w10pro64_he (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w10pro64_ja (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > > === w10pro64_zh_CN (64 bit report) === > > windows.gaming.input: > input.c:179: Test failed: IVectorView_Gamepad_GetMany failed, hr 0x8000000b > input.c:351: Test failed: IVectorView_RawGameController_GetMany failed, hr 0x8000000b > I'll fix these, a bit weird that we get E_BOUNDS when vector is empty, but not when it isn't (as in windows.media.speech voices tests), even though the requested range is always out of bounds? -- Rémi Bernon <rbernon(a)codeweavers.com>

1 0

[PATCH 1/5] include: Add DayOfWeek enum in windows.globalization.idl.
by Rémi Bernon March 23, 2021

March 23, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.globalization.idl | 49 +++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 include/windows.globalization.idl diff --git a/include/Makefile.in b/include/Makefile.in index b71de990aa2..46164b8268f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -753,6 +753,7 @@ SOURCES = \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ + windows.globalization.idl \ windows.h \ windows.media.speechsynthesis.idl \ windows.system.idl \ diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl new file mode 100644 index 00000000000..c08f7bd27d9 --- /dev/null +++ b/include/windows.globalization.idl @@ -0,0 +1,49 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Globalization { + typedef enum DayOfWeek DayOfWeek; + } +} + +namespace Windows { + namespace Globalization { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum DayOfWeek + { + Sunday = 0, + Monday = 1, + Tuesday = 2, + Wednesday = 3, + Thursday = 4, + Friday = 5, + Saturday = 6 + }; + } +} -- 2.30.2

2 6

[PATCH 1/5] server: Cancel asyncs before closing handles when a process is destroyed.
by Zebediah Figura March 23, 2021

March 23, 2021

test_exit_process_async() essentially validates this. The only reason it currently succeeds (instead of incorrectly returning ERROR_BROKEN_PIPE) is that due to the use of DuplicateHandle() the source handle is never actually closed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index f65d7abe2af..571a80f0dc6 100644 --- a/server/process.c +++ b/server/process.c @@ -842,8 +842,8 @@ static void process_killed( struct process *process ) if (!process->is_system) close_process_desktop( process ); process->winstation = 0; process->desktop = 0; - close_process_handles( process ); cancel_process_asyncs( process ); + close_process_handles( process ); if (process->idle_event) release_object( process->idle_event ); process->idle_event = NULL; assert( !process->console ); -- 2.30.2

2 5

[PATCH 3/9] devenum: Use nameless structs and unions.
by Jacek Caban March 23, 2021

March 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/devenum/Makefile.in | 1 - dlls/devenum/createdevenum.c | 48 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 25 deletions(-)

2 1