September 2020 - Wine-devel

[PATCH 2/5] dmime: Simplify the parse_segments_list() helper
by Michael Stefaniuc 24 Sep '20

24 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 67 ++++++++---------------------------- 1 file changed, 14 insertions(+), 53 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 000d597bb54..3159916ccdf 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -259,8 +259,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); } -static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DWORD size, IStream *pStm) { DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -270,12 +269,7 @@ static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHU IDirectMusicObject* pObject = NULL; LPDMUS_PRIVATE_SEGMENT_ITEM pNewItem = NULL; - if (pChunk->fccID != DMUS_FOURCC_SEGMENT_LIST) { - ERR_(dmfile)(": %s chunk should be a SEGMENT list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); + ListSize[0] = size - sizeof(FOURCC); ListCount[0] = 0; do { @@ -355,53 +349,20 @@ static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, DWORD size, IStream *pStm) +static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, IStream *stream, + const struct chunk_entry *lsgl) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry chunk = {.parent = lsgl}; + HRESULT hr; - ListSize[0] = size - sizeof(FOURCC); - ListCount[0] = 0; + TRACE("Parsing segment list in %p: %s\n", stream, debugstr_chunk(lsgl)); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENT_LIST: { - TRACE_(dmfile)(": SEGMENT list\n"); - hr = parse_segment(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - - return S_OK; + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_SEGMENT_LIST) + if (FAILED(hr = parse_segment(This, stream, &chunk))) + break; + + return SUCCEEDED(hr) ? S_OK : hr; } static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream *stream) @@ -439,7 +400,7 @@ static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream if (chunk.id != FOURCC_LIST || chunk.type != DMUS_FOURCC_SEGMENTS_LIST) return DMUS_E_INVALID_SEGMENTTRIGGERTRACK; - return parse_segments_list(This, chunk.size, stream); + return parse_segments_list(This, stream, &chunk); } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.26.2

1 0

[PATCH 1/5] dmime: Reimplement IPersistStream_Load() for SegTrigger track
by Michael Stefaniuc 24 Sep '20

24 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 140 +++++++++-------------------------- 1 file changed, 34 insertions(+), 106 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3e7503ac0ca..000d597bb54 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -254,6 +254,11 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { segment_track_Join }; +static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); +} + static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) { @@ -350,20 +355,14 @@ static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, DWORD size, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - if (pChunk->fccID != DMUS_FOURCC_SEGMENTS_LIST) { - ERR_(dmfile)(": %s chunk should be a SEGMENTS list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); + ListSize[0] = size - sizeof(FOURCC); ListCount[0] = 0; do { @@ -405,113 +404,42 @@ static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, DMUS_PRIVA return S_OK; } -static HRESULT parse_seqtrack_list(IDirectMusicSegTriggerTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - if (pChunk->fccID != DMUS_FOURCC_SEGTRACK_LIST) { - ERR_(dmfile)(": %s chunk should be a SEGTRACK list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } + IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry segt = {0}; + struct chunk_entry chunk = {.parent = &segt}; + DMUS_IO_SEGMENT_TRACK_HEADER header; + HRESULT hr; - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); - ListCount[0] = 0; + TRACE("(%p, %p): Loading\n", This, stream); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGTRACK_CHUNK: { - TRACE_(dmfile)(": segment trigger track chunk\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENTS_LIST: { - TRACE_(dmfile)(": SEGMENTS list\n"); - hr = parse_segments_list(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); + if (!stream) + return E_POINTER; - return S_OK; -} + if (stream_get_chunk(stream, &segt) != S_OK || segt.id != FOURCC_LIST || + segt.type != DMUS_FOURCC_SEGTRACK_LIST) + return DMUS_E_INVALID_SEGMENTTRIGGERTRACK; -static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStream *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); -} + if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) + return FAILED(hr) ? hr : DMUS_E_INVALID_SEGMENTTRIGGERTRACK; -static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream *pStm) -{ - IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - LARGE_INTEGER liMove; - HRESULT hr; + /* Optional and useless header chunk */ + if (chunk.id == DMUS_FOURCC_SEGTRACK_CHUNK) { + hr = stream_chunk_get_data(stream, &chunk, &header, sizeof(DMUS_IO_SEGMENT_TRACK_HEADER)); + if (FAILED(hr)) + return hr; + if (header.dwFlags) + WARN("Got flags %#x; must be zero\n", header.dwFlags); - TRACE("(%p, %p): Loading\n", This, pStm); - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGTRACK_LIST: { - TRACE_(dmfile)(": segment trigger track list\n"); - hr = parse_seqtrack_list(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; + if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) + return FAILED(hr) ? hr : DMUS_E_INVALID_SEGMENTTRIGGERTRACK; } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - return E_FAIL; - } - } - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - } - return S_OK; + if (chunk.id != FOURCC_LIST || chunk.type != DMUS_FOURCC_SEGMENTS_LIST) + return DMUS_E_INVALID_SEGMENTTRIGGERTRACK; + + return parse_segments_list(This, chunk.size, stream); } static const IPersistStreamVtbl persiststream_vtbl = { -- 2.26.2

1 0

[PATCH 1/3] widl: parse attribute custom(guid,expr).
by Kevin Puetz 24 Sep '20

24 Sep '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- tools/widl/parser.l | 2 +- tools/widl/parser.y | 18 ++++++++++++++++++ tools/widl/widltypes.h | 7 +++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 925265d00d..f50975bd67 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -337,6 +337,7 @@ static const struct keyword attr_keywords[] = {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE}, {"control", tCONTROL}, + {"custom", tCUSTOM}, {"decode", tDECODE}, {"defaultbind", tDEFAULTBIND}, {"defaultcollelem", tDEFAULTCOLLELEM}, @@ -427,7 +428,6 @@ static const struct keyword attr_keywords[] = }; /* attributes TODO: - custom first_is last_is max_is diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 52eb96488a..1a300ddb33 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -58,6 +58,7 @@ static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); static attr_t *make_attrp(enum attr_type type, void *val); +static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); @@ -177,6 +178,7 @@ static typelib_t *current_typelib; %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE %token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE +%token tCUSTOM %token tDECODE tDEFAULT tDEFAULTBIND %token tDEFAULTCOLLELEM %token tDEFAULTVALUE @@ -505,6 +507,7 @@ attribute: { $$ = NULL; } | tCONTEXTHANDLENOSERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } | tCONTEXTHANDLESERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } + | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tDEFAULT { $$ = make_attr(ATTR_DEFAULT); } | tDEFAULTBIND { $$ = make_attr(ATTR_DEFAULTBIND); } @@ -1231,6 +1234,8 @@ static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) list = xmalloc( sizeof(*list) ); list_init( list ); } + if(attr->type != ATTR_CUSTOM) + { LIST_FOR_EACH_ENTRY(attr_existing, list, attr_t, entry) if (attr_existing->type == attr->type) { @@ -1239,6 +1244,7 @@ static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) list_remove(&attr_existing->entry); break; } + } list_add_tail( list, &attr->entry ); return list; } @@ -1363,6 +1369,17 @@ static attr_t *make_attrp(enum attr_type type, void *val) return a; } +static attr_t *make_custom_attr(UUID *id, expr_t *pval) +{ + attr_t *a = xmalloc(sizeof(attr_t)); + attr_custdata_t *cstdata = xmalloc(sizeof(attr_custdata_t)); + a->type = ATTR_CUSTOM; + cstdata->id = *id; + cstdata->pval = pval; + a->u.pval = cstdata; + return a; +} + static expr_list_t *append_expr(expr_list_t *list, expr_t *expr) { if (!expr) return list; @@ -2136,6 +2153,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_COMMSTATUS */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, + /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, "custom" }, /* ATTR_DECODE */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, /* ATTR_DEFAULT */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, "default" }, /* ATTR_DEFAULTBIND */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f..6b67538594 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -37,6 +37,7 @@ typedef GUID UUID; typedef struct _loc_info_t loc_info_t; typedef struct _attr_t attr_t; +typedef struct _attr_custdata_t attr_custdata_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; typedef struct _var_t var_t; @@ -83,6 +84,7 @@ enum attr_type ATTR_COMMSTATUS, ATTR_CONTEXTHANDLE, ATTR_CONTROL, + ATTR_CUSTOM, ATTR_DECODE, ATTR_DEFAULT, ATTR_DEFAULTBIND, @@ -337,6 +339,11 @@ struct _expr_t { struct list entry; }; +struct _attr_custdata_t { + GUID id; + expr_t *pval; +}; + struct struct_details { var_list_t *fields;

1 2

[PATCH 2/2] winegstreamer: Avoid leaking a newly allocated buffer on failure in request_buffer_src().
by Zebediah Figura 24 Sep '20

24 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9a9fe01936b..acb15dc9238 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -878,13 +878,14 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } -static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) +static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buffer) { struct gstdemux *This = gst_pad_get_element_private(pad); + GstBuffer *new_buffer = NULL; HRESULT hr; GstMapInfo info; - TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buf); + TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buffer); if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; @@ -896,13 +897,16 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - if (!*buf) - *buf = gst_buffer_new_and_alloc(len); - gst_buffer_map(*buf, &info, GST_MAP_WRITE); + if (!*buffer) + *buffer = new_buffer = gst_buffer_new_and_alloc(len); + gst_buffer_map(*buffer, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); - gst_buffer_unmap(*buf, &info); - if (FAILED(hr)) { - ERR("Returned %08x\n", hr); + gst_buffer_unmap(*buffer, &info); + if (FAILED(hr)) + { + ERR("Failed to read data, hr %#x.\n", hr); + if (new_buffer) + gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; } -- 2.28.0

1 0

[PATCH 1/4] wined3d: Factor out wined3d_state_uses_depth_buffer().
by Zebediah Figura 24 Sep '20

24 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 8 +++----- dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b7ca8ceca2e..e3eae3aab58 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4491,7 +4491,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s * that we never copy the stencil data.*/ DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) + if (wined3d_state_uses_depth_buffer(state)) wined3d_rendertarget_view_load_location(dsv, context, location); else wined3d_rendertarget_view_prepare_location(dsv, context, location); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad72e51816d..249658b1093 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2148,8 +2148,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if ((state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - && (view = state->fb.depth_stencil)) + if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2165,8 +2164,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), state->render_states[WINED3D_RS_ZWRITEENABLE] - || state->render_states[WINED3D_RS_ZENABLE], 0))) + ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) { ERR("Failed to get render pass.\n"); return false; @@ -2855,7 +2853,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if ((dsv = state->fb.depth_stencil)) { - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) + if (wined3d_state_uses_depth_buffer(state)) wined3d_rendertarget_view_load_location(dsv, &context_vk->c, dsv->resource->draw_binding); else wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 13d8bce1acc..3fce04673aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4264,8 +4264,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device } } - if (state->render_states[WINED3D_RS_ZENABLE] || state->render_states[WINED3D_RS_ZWRITEENABLE] - || state->render_states[WINED3D_RS_STENCILENABLE]) + if (wined3d_state_uses_depth_buffer(state) || state->render_states[WINED3D_RS_STENCILENABLE]) { struct wined3d_rendertarget_view *rt = device->state.fb.render_targets[0]; struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec3b497f14c..355343b6b9e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3621,6 +3621,11 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; +static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *state) +{ + return state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]; +} + struct wined3d_dummy_textures { GLuint tex_1d; -- 2.28.0

4 7

[PATCH 4/4] conhost: Terminate pseudo console on input error.
by Jacek Caban 24 Sep '20

24 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] conhost/tests: Don't use inheritable handle for console pipe end.
by Jacek Caban 24 Sep '20

24 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/4] kernelbase: Duplicate input and output handles to ensure that they are inheritable.
by Jacek Caban 24 Sep '20

24 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 1/4] conhost: Improve bound checking in fill_output.
by Jacek Caban 24 Sep '20

24 Sep '20

Inspired by Pengpeng Dong's patch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo in commit message programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] msvcrt: Implement _mbsnextc_l().
by Paul Gofman 24 Sep '20

24 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 14 +++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 7 +++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- include/msvcrt/mbstring.h | 3 ++- 12 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 84ae0f449bf..f33d8c8f3d3 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -154,7 +154,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) ucrtbase._mbsnextc -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) ucrtbase._mbsnextc_l @ cdecl _mbsnicmp(str str long) ucrtbase._mbsnicmp @ stub _mbsnicmp_l @ cdecl _mbsnicoll(str str long) ucrtbase._mbsnicoll diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index f9cfe67c1b0..d260ff138e3 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -578,7 +578,7 @@ @ stub _o__mbsncpy_s @ stub _o__mbsncpy_s_l @ cdecl _o__mbsnextc(str) ucrtbase._o__mbsnextc -@ stub _o__mbsnextc_l +@ cdecl _o__mbsnextc_l(str ptr) ucrtbase._o__mbsnextc_l @ cdecl _o__mbsnicmp(str str long) ucrtbase._o__mbsnicmp @ stub _o__mbsnicmp_l @ stub _o__mbsnicoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 577fb69b5a2..02cba0e3e7e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1160,7 +1160,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 97edbec6a74..b545ffc25c8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1517,7 +1517,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1aa63de64a1..662c0973674 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1527,7 +1527,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a31943e4d7d..bc5c6f7bd99 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -832,7 +832,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ff58757cb89..38b3912b4ab 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -810,7 +810,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index dc52cf1b8cf..2a42c097b42 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -393,15 +393,23 @@ int CDECL _getmbcp(void) } /********************************************************************* - * _mbsnextc(MSVCRT.@) + * _mbsnextc_l(MSVCRT.@) */ -unsigned int CDECL _mbsnextc(const unsigned char* str) +unsigned int CDECL _mbsnextc_l(const unsigned char* str, MSVCRT__locale_t locale) { - if(_ismbblead(*str)) + if(_ismbblead_l(*str, locale)) return *str << 8 | str[1]; return *str; } +/********************************************************************* + * _mbsnextc(MSVCRT.@) + */ +unsigned int CDECL _mbsnextc(const unsigned char* str) +{ + return _mbsnextc_l(str, NULL); +} + /********************************************************************* * _mbctolower(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6da32d025d8..9c049455af2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -778,7 +778,7 @@ # stub _mbsncpy_s(ptr long str long) # stub _mbsncpy_s_l(ptr long str long ptr) @ cdecl _mbsnextc(str) -# stub _mbsnextc_l(str ptr) +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) # stub _mbsnicmp_l(str str long ptr) @ stub _mbsnicoll(str str long) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a08a76fc687..c6175189884 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -114,6 +114,7 @@ static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned c static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +static unsigned int (__cdecl *p_mbsnextc_l)(const unsigned char*, _locale_t); int CDECL __STRINGTOLD(_LDOUBLE*, char**, const char*, int); @@ -351,6 +352,11 @@ static void test_mbcp(void) expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */ expect_eq(_mbsnextc(&mbstring[3]), 0x20, int, "%x"); /* single char */ + if (!p_mbsnextc_l) + win_skip("_mbsnextc_l tests\n"); + else + expect_eq(p_mbsnextc_l(mbstring, NULL), 0xb0b1, int, "%x"); + /* _mbclen/_mbslen */ expect_eq(_mbclen(mbstring), 2, int, "%d"); expect_eq(_mbclen(&mbstring[2]), 2, int, "%d"); @@ -4451,6 +4457,7 @@ START_TEST(string) p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); + p_mbsnextc_l = (void*)GetProcAddress(hMsvcrt, "_mbsnextc_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4981d7fbac7..ee06053a700 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -673,7 +673,7 @@ @ stub _mbsncpy_s @ stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -@ stub _mbsnextc_l +@ cdecl _mbsnextc_l(str ptr) @ cdecl _mbsnicmp(str str long) @ stub _mbsnicmp_l @ stub _mbsnicoll(str str long) @@ -1242,7 +1242,7 @@ @ stub _o__mbsncpy_s @ stub _o__mbsncpy_s_l @ cdecl _o__mbsnextc(str) _mbsnextc -@ stub _o__mbsnextc_l +@ cdecl _o__mbsnextc_l(str ptr) _mbsnextc_l @ cdecl _o__mbsnicmp(str str long) _mbsnicmp @ stub _o__mbsnicmp_l @ stub _o__mbsnicoll diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 80be664aaaa..82bc6f1aeee 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -90,7 +90,8 @@ size_t __cdecl _mbsnccnt(const unsigned char*,size_t); int __cdecl _mbsncmp(const unsigned char*,const unsigned char*,size_t); int __cdecl _mbsncoll(const unsigned char*,const unsigned char*,size_t); unsigned char* __cdecl _mbsncpy(unsigned char*,const unsigned char*,size_t); -unsigned int __cdecl _mbsnextc (const unsigned char*); +unsigned int __cdecl _mbsnextc(const unsigned char*); +unsigned int __cdecl _mbsnextc_l(const unsigned char*,_locale_t); int __cdecl _mbsnicmp(const unsigned char*,const unsigned char*,size_t); int __cdecl _mbsnicoll(const unsigned char*,const unsigned char*,size_t); unsigned char* __cdecl _mbsninc(const unsigned char*,size_t); -- 2.26.2

2 3