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

[PATCH 05/10] ddraw: Introduce a helper to convert ddraw stateblock types to wined3d types.
by Henri Verbeet 31 Mar '20

31 Mar '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ede9c77031a..e09100dfdc7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -101,6 +101,11 @@ static enum wined3d_primitive_type wined3d_primitive_type_from_ddraw(D3DPRIMITIV return (enum wined3d_primitive_type)type; } +static enum wined3d_stateblock_type wined3d_stateblock_type_from_ddraw(D3DSTATEBLOCKTYPE type) +{ + return (enum wined3d_stateblock_type)type; +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -5969,9 +5974,8 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface, return D3DERR_INBEGINSTATEBLOCK; } - /* The D3DSTATEBLOCKTYPE enum is fine here. */ - hr = wined3d_stateblock_create(device->wined3d_device, device->state, type, &wined3d_sb); - if (FAILED(hr)) + if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, + device->state, wined3d_stateblock_type_from_ddraw(type), &wined3d_sb))) { WARN("Failed to create stateblock, hr %#x.\n", hr); wined3d_mutex_unlock(); -- 2.20.1

1 0

[PATCH 04/10] ddraw: Introduce a helper to convert ddraw primitive types to wined3d types.
by Henri Verbeet 31 Mar '20

31 Mar '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4a10eb07df9..ede9c77031a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -96,6 +96,11 @@ static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSF } } +static enum wined3d_primitive_type wined3d_primitive_type_from_ddraw(D3DPRIMITIVETYPE type) +{ + return (enum wined3d_primitive_type)type; +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -3464,7 +3469,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, goto done; wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vertex_count); @@ -3675,7 +3680,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / stride); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); @@ -4002,7 +4007,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM goto done; wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, vertex_count); @@ -4138,7 +4143,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vtx_dst_stride); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); @@ -4260,7 +4265,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } /* Now draw the primitives */ - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -4414,7 +4419,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); -- 2.20.1

1 0

[PATCH 03/10] ddraw: Introduce a helper to convert ddraw transform states to wined3d states.
by Henri Verbeet 31 Mar '20

31 Mar '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 81 ++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 60 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d62d38e07be..4a10eb07df9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -79,6 +79,23 @@ static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATET return (enum wined3d_render_state)state; } +static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) +{ + switch (state) + { + case D3DTRANSFORMSTATE_WORLD: + return WINED3D_TS_WORLD_MATRIX(0); + case D3DTRANSFORMSTATE_WORLD1: + return WINED3D_TS_WORLD_MATRIX(1); + case D3DTRANSFORMSTATE_WORLD2: + return WINED3D_TS_WORLD_MATRIX(2); + case D3DTRANSFORMSTATE_WORLD3: + return WINED3D_TS_WORLD_MATRIX(3); + default: + return (enum wined3d_transform_state)state; + } +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -3096,34 +3113,16 @@ static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface, D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - enum wined3d_transform_state wined3d_state; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - switch (state) - { - case D3DTRANSFORMSTATE_WORLD: - wined3d_state = WINED3D_TS_WORLD_MATRIX(0); - break; - case D3DTRANSFORMSTATE_WORLD1: - wined3d_state = WINED3D_TS_WORLD_MATRIX(1); - break; - case D3DTRANSFORMSTATE_WORLD2: - wined3d_state = WINED3D_TS_WORLD_MATRIX(2); - break; - case D3DTRANSFORMSTATE_WORLD3: - wined3d_state = WINED3D_TS_WORLD_MATRIX(3); - break; - default: - wined3d_state = state; - } - if (!matrix) return DDERR_INVALIDPARAMS; /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_set_transform(device->update_state, wined3d_state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, + wined3d_transform_state_from_ddraw(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -3205,34 +3204,15 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface, D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - enum wined3d_transform_state wined3d_state; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - switch (state) - { - case D3DTRANSFORMSTATE_WORLD: - wined3d_state = WINED3D_TS_WORLD_MATRIX(0); - break; - case D3DTRANSFORMSTATE_WORLD1: - wined3d_state = WINED3D_TS_WORLD_MATRIX(1); - break; - case D3DTRANSFORMSTATE_WORLD2: - wined3d_state = WINED3D_TS_WORLD_MATRIX(2); - break; - case D3DTRANSFORMSTATE_WORLD3: - wined3d_state = WINED3D_TS_WORLD_MATRIX(3); - break; - default: - wined3d_state = state; - } - if (!matrix) return DDERR_INVALIDPARAMS; /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - memcpy(matrix, &device->stateblock_state->transforms[wined3d_state], sizeof(*matrix)); + memcpy(matrix, &device->stateblock_state->transforms[wined3d_transform_state_from_ddraw(state)], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -3309,32 +3289,13 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - enum wined3d_transform_state wined3d_state; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - switch (state) - { - case D3DTRANSFORMSTATE_WORLD: - wined3d_state = WINED3D_TS_WORLD_MATRIX(0); - break; - case D3DTRANSFORMSTATE_WORLD1: - wined3d_state = WINED3D_TS_WORLD_MATRIX(1); - break; - case D3DTRANSFORMSTATE_WORLD2: - wined3d_state = WINED3D_TS_WORLD_MATRIX(2); - break; - case D3DTRANSFORMSTATE_WORLD3: - wined3d_state = WINED3D_TS_WORLD_MATRIX(3); - break; - default: - wined3d_state = state; - } - /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_multiply_transform(device->state, - wined3d_state, (struct wined3d_matrix *)matrix); + wined3d_transform_state_from_ddraw(state), (struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; -- 2.20.1

1 0

[PATCH 02/10] ddraw: Introduce a helper to convert ddraw render states to wined3d states.
by Henri Verbeet 31 Mar '20

31 Mar '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 048ba7fba66..d62d38e07be 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -72,6 +72,13 @@ static inline WORD d3d_fpu_setup(void) return oldcw; } +static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) +{ + if (state == D3DRENDERSTATE_ZBIAS) + return WINED3D_RS_DEPTHBIAS; + return (enum wined3d_render_state)state; +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -2396,10 +2403,6 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = DDERR_INVALIDPARAMS; break; - case D3DRENDERSTATE_ZBIAS: - *value = device_state->rs[WINED3D_RS_DEPTHBIAS]; - break; - default: if (state >= D3DRENDERSTATE_STIPPLEPATTERN00 && state <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2408,7 +2411,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; } - *value = device_state->rs[state]; + *value = device_state->rs[wined3d_render_state_from_ddraw(state)]; } wined3d_mutex_unlock(); @@ -2622,10 +2625,6 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, hr = DDERR_INVALIDPARAMS; break; - case D3DRENDERSTATE_ZBIAS: - wined3d_stateblock_set_render_state(device->update_state, WINED3D_RS_DEPTHBIAS, value); - break; - default: if (state >= D3DRENDERSTATE_STIPPLEPATTERN00 && state <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2635,7 +2634,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - wined3d_stateblock_set_render_state(device->update_state, state, value); + wined3d_stateblock_set_render_state(device->update_state, wined3d_render_state_from_ddraw(state), value); break; } wined3d_mutex_unlock(); -- 2.20.1

1 0

[PATCH 01/10] d3d8/test: Avoid abs() on unsigned values in compare_mode().
by Henri Verbeet 31 Mar '20

31 Mar '20

From: Chip Davis <cdavis(a)codeweavers.com> Mostly because Clang complains. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d87832b716d..26687af5f15 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1294,8 +1294,8 @@ static int compare_mode(const void *a, const void *b) { const struct mode *mode_a = a; const struct mode *mode_b = b; - unsigned int w = mode_a->w - mode_b->w; - unsigned int h = mode_a->h - mode_b->h; + int w = mode_a->w - mode_b->w; + int h = mode_a->h - mode_b->h; return abs(w) >= abs(h) ? -w : -h; } -- 2.20.1

1 0

[v4 PATCH] comctl32/toolbar: Correctly draw disabled button which contains 32 bpp bitmap with alpha channel.
by Nikolay Sivov 31 Mar '20

31 Mar '20

From: Ziqing Hui <zhui(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: made draw parameters initialization more explicit, so it's easier to follow what initial configuration is. v3: * Move imagelist_has_alpha() declaration to dlls/comctl32/comctl32.h * Use ImageList_DrawIndirect() to replace ImageList_DrawEx() dlls/comctl32/comctl32.h | 1 + dlls/comctl32/imagelist.c | 5 +++++ dlls/comctl32/toolbar.c | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 78e9798338..66b341ae5a 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -191,6 +191,7 @@ INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; +BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN; #define COMCTL32_VERSION_MINOR 81 diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 925952351f..013ae42f88 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -143,6 +143,11 @@ static BOOL is_valid(HIMAGELIST himl); #define TILE_COUNT 4 +BOOL imagelist_has_alpha( HIMAGELIST himl, UINT index ) +{ + return himl->item_flags[index] & ILIF_ALPHA; +} + static inline UINT imagelist_height( UINT count ) { return ((count + TILE_COUNT - 1)/TILE_COUNT); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c302e6c111..b869cc4d7b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -675,18 +675,45 @@ TOOLBAR_DrawPattern (const RECT *lpRect, const NMTBCUSTOMDRAW *tbcd) static void TOOLBAR_DrawMasked(HIMAGELIST himl, int index, HDC hdc, INT x, INT y, UINT draw_flags) { + IMAGELISTDRAWPARAMS draw_params = { 0 }; INT cx, cy; HBITMAP hbmMask, hbmImage; HDC hdcMask, hdcImage; ImageList_GetIconSize(himl, &cx, &cy); + draw_params.cbSize = sizeof(draw_params); + draw_params.himl = himl; + draw_params.i = index; + draw_params.hdcDst = hdc; + draw_params.x = x; + draw_params.y = y; + draw_params.cx = cx; + draw_params.cy = cy; + draw_params.rgbBk = CLR_NONE; + draw_params.rgbFg = CLR_NONE; + draw_params.fStyle = draw_flags; + draw_params.fState = ILS_NORMAL; + + /* 32bpp image with alpha channel is converted to grayscale */ + if (imagelist_has_alpha(himl, index)) + { + draw_params.fState = ILS_SATURATE; + ImageList_DrawIndirect(&draw_params); + return; + } + /* Create src image */ hdcImage = CreateCompatibleDC(hdc); hbmImage = CreateCompatibleBitmap(hdc, cx, cy); SelectObject(hdcImage, hbmImage); - ImageList_DrawEx(himl, index, hdcImage, 0, 0, cx, cy, - RGB(0xff, 0xff, 0xff), RGB(0,0,0), draw_flags); + + draw_params.x = 0; + draw_params.y = 0; + draw_params.rgbBk = RGB(0xff, 0xff, 0xff); + draw_params.rgbFg = RGB(0,0,0); + draw_params.hdcDst = hdcImage; + ImageList_DrawIndirect(&draw_params); /* Create Mask */ hdcMask = CreateCompatibleDC(0); @@ -694,8 +721,9 @@ static void TOOLBAR_DrawMasked(HIMAGELIST himl, int index, HDC hdc, INT x, INT y SelectObject(hdcMask, hbmMask); /* Remove the background and all white pixels */ - ImageList_DrawEx(himl, index, hdcMask, 0, 0, cx, cy, - RGB(0xff, 0xff, 0xff), RGB(0,0,0), ILD_MASK); + draw_params.fStyle = ILD_MASK; + draw_params.hdcDst = hdcMask; + ImageList_DrawIndirect(&draw_params); SetBkColor(hdcImage, RGB(0xff, 0xff, 0xff)); BitBlt(hdcMask, 0, 0, cx, cy, hdcImage, 0, 0, NOTSRCERASE); -- 2.25.1

1 0

[PATCH v2] ucrtbase: Export _o___stdio_common_v[fs]wprintf functions.
by Piotr Caban 31 Mar '20

31 Mar '20

From: Myah Caron <qsniyg(a)mail.com> Signed-off-by: Myah Caron <qsniyg(a)mail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - supersedes 182375 and 182376 - cleanup commit message and merge the patches .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH vkd3d] include: Use the correct type for the tessellator partitioning compile argument.
by Henri Verbeet 31 Mar '20

31 Mar '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 182371. include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6b4d3f5..327b788 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -272,7 +272,7 @@ struct vkd3d_shader_domain_shader_compile_arguments const void *next; enum vkd3d_tessellator_output_primitive output_primitive; - enum vkd3d_tessellator_output_primitive partitioning; + enum vkd3d_tessellator_partitioning partitioning; }; /* root signature 1.0 */ -- 2.20.1

1 0

[PATCH v2 1/6] winedbg: Force read data to be NUL terminated.
by Rémi Bernon 31 Mar '20

31 Mar '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 052e73b2ad69..e2954c08dddf 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1848,12 +1848,14 @@ static int fetch_data(struct gdb_context* gdbctx) if (gdbctx->in_len + STEP > gdbctx->in_buf_alloc) gdbctx->in_buf = packet_realloc(gdbctx->in_buf, gdbctx->in_buf_alloc += STEP); #undef STEP - len = read(gdbctx->sock, gdbctx->in_buf + gdbctx->in_len, gdbctx->in_buf_alloc - gdbctx->in_len); + len = read(gdbctx->sock, gdbctx->in_buf + gdbctx->in_len, gdbctx->in_buf_alloc - gdbctx->in_len - 1); if (len <= 0) break; gdbctx->in_len += len; assert(gdbctx->in_len <= gdbctx->in_buf_alloc); if (len < gdbctx->in_buf_alloc - gdbctx->in_len) break; } + + gdbctx->in_buf[gdbctx->in_len] = '\0'; return gdbctx->in_len - in_len; } -- 2.26.0.rc2

1 5

[PATCH 1/5] mfreadwrite: Use single reader lock for all streams.
by Nikolay Sivov 31 Mar '20

31 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 228 ++++++++++++++++++++++---------------- 1 file changed, 130 insertions(+), 98 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 9a7c5e5fd7..b8e1ab0106 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -108,9 +108,6 @@ struct media_stream IMFTransform *decoder; DWORD id; unsigned int index; - CRITICAL_SECTION cs; - CONDITION_VARIABLE sample_event; - struct list responses; enum media_stream_state state; BOOL selected; BOOL presented; @@ -150,7 +147,9 @@ struct source_reader enum media_source_state source_state; struct media_stream *streams; DWORD stream_count; + struct list responses; CRITICAL_SECTION cs; + CONDITION_VARIABLE sample_event; }; static inline struct source_reader *impl_from_IMFSourceReader(IMFSourceReader *iface) @@ -327,7 +326,7 @@ static void source_reader_queue_response(struct source_reader *reader, struct me if (response->sample) IMFSample_AddRef(response->sample); - list_add_tail(&stream->responses, &response->entry); + list_add_tail(&reader->responses, &response->entry); if (stream->requests) { @@ -343,7 +342,7 @@ static void source_reader_queue_response(struct source_reader *reader, struct me } } else - WakeAllConditionVariable(&stream->sample_event); + WakeAllConditionVariable(&reader->sample_event); stream->requests--; } @@ -386,12 +385,15 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM return hr; } + EnterCriticalSection(&reader->cs); + for (i = 0; i < reader->stream_count; ++i) { if (id == reader->streams[i].id) { - if (!InterlockedCompareExchangePointer((void **)&reader->streams[i].stream, stream, NULL)) + if (!reader->streams[i].stream) { + reader->streams[i].stream = stream; IMFMediaStream_AddRef(reader->streams[i].stream); if (FAILED(hr = IMFMediaStream_BeginGetEvent(stream, &reader->stream_events_callback, (IUnknown *)stream))) @@ -399,10 +401,8 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM WARN("Failed to subscribe to stream events, hr %#x.\n", hr); } - EnterCriticalSection(&reader->streams[i].cs); if (reader->streams[i].requests) source_reader_request_sample(reader, &reader->streams[i]); - LeaveCriticalSection(&reader->streams[i].cs); } break; } @@ -411,6 +411,8 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM if (i == reader->stream_count) WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + LeaveCriticalSection(&reader->cs); + IMFMediaStream_Release(stream); return hr; @@ -630,21 +632,19 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, return hr; } + EnterCriticalSection(&reader->cs); + for (i = 0; i < reader->stream_count; ++i) { if (id == reader->streams[i].id) { /* FIXME: propagate processing errors? */ - EnterCriticalSection(&reader->streams[i].cs); - reader->streams[i].flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; hr = source_reader_process_sample(reader, &reader->streams[i], sample); if (reader->streams[i].requests) source_reader_request_sample(reader, &reader->streams[i]); - LeaveCriticalSection(&reader->streams[i].cs); - break; } } @@ -652,6 +652,8 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, if (i == reader->stream_count) WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + LeaveCriticalSection(&reader->cs); + IMFSample_Release(sample); return hr; @@ -675,14 +677,14 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re return hr; } + EnterCriticalSection(&reader->cs); + for (i = 0; i < reader->stream_count; ++i) { struct media_stream *stream = &reader->streams[i]; if (id == stream->id) { - EnterCriticalSection(&stream->cs); - switch (event_type) { case MEEndOfStream: @@ -716,12 +718,12 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re ; } - LeaveCriticalSection(&stream->cs); - break; } } + LeaveCriticalSection(&reader->cs); + return S_OK; } @@ -790,18 +792,33 @@ static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallba return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } -static struct stream_response *media_stream_pop_response(struct media_stream *stream) +static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream) { - struct stream_response *response = NULL; + struct stream_response *response; struct list *head; - if ((head = list_head(&stream->responses))) + if (stream) { - response = LIST_ENTRY(head, struct stream_response, entry); - list_remove(&response->entry); + LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) + { + if (response->stream_index == stream->index) + { + list_remove(&response->entry); + return response; + } + } + } + else + { + if ((head = list_head(&reader->responses))) + { + response = LIST_ENTRY(head, struct stream_response, entry); + list_remove(&response->entry); + return response; + } } - return response; + return NULL; } static void source_reader_release_response(struct stream_response *response) @@ -857,13 +874,38 @@ static HRESULT source_reader_start_source(struct source_reader *reader) return hr; } +static BOOL source_reader_got_response_for_stream(struct source_reader *reader, struct media_stream *stream) +{ + struct stream_response *response; + + LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) + { + if (response->stream_index == stream->index) + return TRUE; + } + + return FALSE; +} + static BOOL source_reader_get_read_result(struct source_reader *reader, struct media_stream *stream, DWORD flags, HRESULT *status, DWORD *stream_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { struct stream_response *response = NULL; BOOL request_sample = FALSE; - if (list_empty(&stream->responses)) + if ((response = media_stream_pop_response(reader, stream))) + { + *status = response->status; + *stream_index = stream->index; + *stream_flags = response->stream_flags; + *timestamp = response->timestamp; + *sample = response->sample; + if (*sample) + IMFSample_AddRef(*sample); + + source_reader_release_response(response); + } + else { *status = S_OK; *stream_index = stream->index; @@ -880,20 +922,6 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m *stream_flags = 0; } } - else - { - response = media_stream_pop_response(stream); - - *status = response->status; - *stream_index = stream->index; - *stream_flags = response->stream_flags; - *timestamp = response->timestamp; - *sample = response->sample; - if (*sample) - IMFSample_AddRef(*sample); - - source_reader_release_response(response); - } return !request_sample; } @@ -925,12 +953,19 @@ static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, return hr; } -static void source_reader_release_responses(struct media_stream *stream) +static void source_reader_release_responses(struct source_reader *reader, struct media_stream *stream) { struct stream_response *ptr, *next; - LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->responses, struct stream_response, entry) + LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &reader->responses, struct stream_response, entry) { + if (stream && stream->index != ptr->stream_index && + ptr->stream_index != MF_SOURCE_READER_FIRST_VIDEO_STREAM && + ptr->stream_index != MF_SOURCE_READER_FIRST_AUDIO_STREAM && + ptr->stream_index != MF_SOURCE_READER_ANY_STREAM) + { + continue; + } list_remove(&ptr->entry); source_reader_release_response(ptr); } @@ -938,42 +973,42 @@ static void source_reader_release_responses(struct media_stream *stream) static void source_reader_flush_stream(struct source_reader *reader, DWORD stream_index) { - struct media_stream *stream = &reader->streams[stream_index]; - - EnterCriticalSection(&stream->cs); + struct media_stream *stream = stream_index == MF_SOURCE_READER_ALL_STREAMS ? NULL : &reader->streams[stream_index]; - source_reader_release_responses(stream); + source_reader_release_responses(reader, stream); if (stream->decoder) IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); stream->requests = 0; - - LeaveCriticalSection(&stream->cs); } static HRESULT source_reader_flush(struct source_reader *reader, unsigned int index) { unsigned int stream_index; - switch (index) + EnterCriticalSection(&reader->cs); + + if (index == MF_SOURCE_READER_ALL_STREAMS) { - case MF_SOURCE_READER_FIRST_VIDEO_STREAM: - stream_index = reader->first_video_stream_index; - break; - case MF_SOURCE_READER_FIRST_AUDIO_STREAM: - stream_index = reader->first_audio_stream_index; - break; - case MF_SOURCE_READER_ALL_STREAMS: - for (stream_index = 0; stream_index < reader->stream_count; ++stream_index) - { - source_reader_flush_stream(reader, stream_index); - } + source_reader_flush_stream(reader, index); + } + else + { + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + stream_index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + stream_index = reader->first_audio_stream_index; + break; + default: + stream_index = index; + } - break; - default: - stream_index = index; + source_reader_flush_stream(reader, stream_index); } - source_reader_flush_stream(reader, stream_index); + LeaveCriticalSection(&reader->cs); return S_OK; } @@ -1002,9 +1037,9 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb if (FAILED(hr = source_reader_get_stream_read_index(reader, command->stream_index, &stream_index))) return hr; - stream = &reader->streams[stream_index]; + EnterCriticalSection(&reader->cs); - EnterCriticalSection(&stream->cs); + stream = &reader->streams[stream_index]; if (SUCCEEDED(hr = source_reader_start_source(reader))) { @@ -1017,7 +1052,7 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb } } - LeaveCriticalSection(&stream->cs); + LeaveCriticalSection(&reader->cs); if (report_sample) IMFSourceReaderCallback_OnReadSample(reader->async_callback, status, stream_index, stream_flags, @@ -1029,11 +1064,10 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb break; case SOURCE_READER_ASYNC_SAMPLE_READY: - stream = &reader->streams[command->stream_index]; - EnterCriticalSection(&stream->cs); - response = media_stream_pop_response(stream); - LeaveCriticalSection(&stream->cs); + EnterCriticalSection(&reader->cs); + response = media_stream_pop_response(reader, NULL); + LeaveCriticalSection(&reader->cs); if (response) { @@ -1126,10 +1160,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaType_Release(stream->current); if (stream->decoder) IMFTransform_Release(stream->decoder); - DeleteCriticalSection(&stream->cs); - - source_reader_release_responses(stream); } + source_reader_release_responses(reader, NULL); heap_free(reader->streams); DeleteCriticalSection(&reader->cs); heap_free(reader); @@ -1544,39 +1576,40 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind if (!actual_index) actual_index = &actual_index_tmp; - if (FAILED(hr = source_reader_get_stream_read_index(reader, index, &stream_index))) - { - *actual_index = index; - *stream_flags = MF_SOURCE_READERF_ERROR; - *timestamp = 0; - return hr; - } - - *actual_index = stream_index; - - stream = &reader->streams[stream_index]; - - EnterCriticalSection(&stream->cs); + EnterCriticalSection(&reader->cs); if (SUCCEEDED(hr = source_reader_start_source(reader))) { - if (!source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, - timestamp, sample)) + if (SUCCEEDED(hr = source_reader_get_stream_read_index(reader, index, &stream_index))) { - while (list_empty(&stream->responses) && stream->state != STREAM_STATE_EOS) + *actual_index = stream_index; + + stream = &reader->streams[stream_index]; + + if (!source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + timestamp, sample)) { - stream->requests++; - if (FAILED(hr = source_reader_request_sample(reader, stream))) - WARN("Failed to request a sample, hr %#x.\n", hr); - SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); - } + while (!source_reader_got_response_for_stream(reader, stream) && stream->state != STREAM_STATE_EOS) + { + stream->requests++; + if (FAILED(hr = source_reader_request_sample(reader, stream))) + WARN("Failed to request a sample, hr %#x.\n", hr); + SleepConditionVariableCS(&reader->sample_event, &reader->cs, INFINITE); + } - source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, - timestamp, sample); + source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + timestamp, sample); + } + } + else + { + *actual_index = index; + *stream_flags = MF_SOURCE_READERF_ERROR; + *timestamp = 0; } } - LeaveCriticalSection(&stream->cs); + LeaveCriticalSection(&reader->cs); TRACE("Stream %u, got sample %p, flags %#x.\n", *actual_index, *sample, *stream_flags); @@ -1796,9 +1829,11 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->async_commands_callback.lpVtbl = &async_commands_callback_vtbl; object->refcount = 1; + list_init(&object->responses); object->source = source; IMFMediaSource_AddRef(object->source); InitializeCriticalSection(&object->cs); + InitializeConditionVariable(&object->sample_event); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; @@ -1845,9 +1880,6 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri break; object->streams[i].index = i; - InitializeCriticalSection(&object->streams[i].cs); - InitializeConditionVariable(&object->streams[i].sample_event); - list_init(&object->streams[i].responses); } if (FAILED(hr)) -- 2.25.1

1 4