September 2019 - Wine-commits

Francois Gouget : testbot/WineRunTask: Make the GetAgent() parameter more explicit.
by Alexandre Julliard 17 Sep '19

17 Sep '19

Module: tools Branch: master Commit: e1b54bf69625998852857dc1a59b322e6262b987 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e1b54bf69625998852857dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:36:05 2019 +0200 testbot/WineRunTask: Make the GetAgent() parameter more explicit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 432bf51..d987df7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -411,7 +411,7 @@ if (!$TA->SetTime()) { # Not a fatal error. Try the next port in case the VM runs a privileged # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent(1); + my $PrivilegedTA = $VM->GetAgent("privileged"); if (!$PrivilegedTA->SetTime()) { LogTaskError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() .". Maybe the TestAgentd process is missing the required privileges.\n");

1 0

Zebediah Figura : winegstreamer: Improve some trace messages.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 9ef5825941707c6908321962e9e583015b001c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef5825941707c6908321962… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:43:26 2019 -0500 winegstreamer: Improve some trace messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 59 ++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index adffee3d24..e76ceda0fe 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -254,12 +254,15 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { + struct gstdemux_source *pin = gst_pad_get_element_private(pad); + gchar *caps_str = gst_caps_to_string(caps); AM_MEDIA_TYPE amt; GstStructure *arg; const char *typename; gboolean ret; - TRACE("%p %p\n", pad, caps); + TRACE("pin %p, caps %s.\n", pin, debugstr_a(caps_str)); + g_free(caps_str); arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); @@ -284,12 +287,14 @@ static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); - struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); + struct gstdemux *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + gchar *caps_str = gst_caps_to_string(caps); GstStructure *arg; const char *typename; gboolean ret; - TRACE("%p %p\n", pad, caps); + TRACE("filter %p, caps %s.\n", filter, debugstr_a(caps_str)); + g_free(caps_str); FreeMediaType(&pin->mt); @@ -302,7 +307,7 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) if (ret) { VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; - This->props.cbBuffer = max(This->props.cbBuffer, vih->bmiHeader.biSizeImage); + filter->props.cbBuffer = max(filter->props.cbBuffer, vih->bmiHeader.biSizeImage); } } else { FIXME("Unhandled type \"%s\"\n", typename); @@ -345,13 +350,12 @@ static gboolean gst_base_src_perform_seek(struct gstdemux *This, GstEvent *event GstEvent *tevent; BOOL thread = !!This->push_thread; - TRACE("%p %p\n", This, event); - gst_event_parse_seek(event, &rate, &seek_format, &flags, &cur_type, &cur, &stop_type, &stop); - if (seek_format != GST_FORMAT_BYTES) { - FIXME("Not handling other format %i\n", seek_format); + if (seek_format != GST_FORMAT_BYTES) + { + FIXME("Unhandled format \"%s\".\n", gst_format_get_name(seek_format)); return FALSE; } @@ -389,7 +393,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) { struct gstdemux *This = gst_pad_get_element_private(pad); - TRACE("%p %p\n", pad, event); + TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); switch (event->type) { case GST_EVENT_SEEK: @@ -407,7 +411,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) LeaveCriticalSection(&This->filter.csFilter); break; default: - FIXME("%p (%u) stub\n", event, event->type); + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); case GST_EVENT_TAG: case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: @@ -420,7 +424,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); - TRACE("%p %p\n", pad, event); + TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); switch (event->type) { case GST_EVENT_SEGMENT: { @@ -435,8 +439,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) rate = segment->rate; applied_rate = segment->applied_rate; - if (segment->format != GST_FORMAT_TIME) { - FIXME("Ignoring new segment because of format %i\n", segment->format); + if (segment->format != GST_FORMAT_TIME) + { + FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); return TRUE; } @@ -482,7 +487,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) return setcaps_sink(pad, caps); } default: - TRACE("%p stub %s\n", event, gst_event_type_get_name(event->type)); + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); return gst_pad_event_default(pad, parent, event); } } @@ -940,7 +945,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) int ret; LONGLONG duration; - TRACE("%p %p %p\n", This, pad, query); + TRACE("filter %p, type %s.\n", This, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -954,9 +959,11 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) return ret; case GST_QUERY_SEEKING: gst_query_parse_seeking (query, &format, NULL, NULL, NULL); - TRACE("Seeking %i %i\n", format, GST_FORMAT_BYTES); if (format != GST_FORMAT_BYTES) + { + WARN("Cannot seek using format \"%s\".\n", gst_format_get_name(format)); return FALSE; + } gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, This->filesize); return TRUE; case GST_QUERY_SCHEDULING: @@ -965,7 +972,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); return TRUE; default: - TRACE("Unhandled query type: %s\n", GST_QUERY_TYPE_NAME(query)); + WARN("Unhandled query type %s.\n", GST_QUERY_TYPE_NAME(query)); return FALSE; } } @@ -974,8 +981,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { struct gstdemux *This = gst_pad_get_element_private(pad); - TRACE("%p %p %u\n", This, pad, activate); - EnterCriticalSection(&This->filter.csFilter); if (!activate) { TRACE("Deactivating\n"); @@ -1003,7 +1008,11 @@ static gboolean activate_push(GstPad *pad, gboolean activate) static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { - TRACE("%p %p 0x%x %u\n", pad, parent, mode, activate); + struct gstdemux *filter = gst_pad_get_element_private(pad); + + TRACE("%s source pad for filter %p in %s mode.\n", + activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); + switch (mode) { case GST_PAD_MODE_PULL: return TRUE; @@ -1017,9 +1026,9 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g static void no_more_pads(GstElement *decodebin, gpointer user) { - struct gstdemux *This = user; - TRACE("%p %p\n", This, decodebin); - SetEvent(This->no_more_pads_event); + struct gstdemux *filter = user; + TRACE("filter %p.\n", filter); + SetEvent(filter->no_more_pads_event); } static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) @@ -1044,7 +1053,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) GError *err = NULL; gchar *dbg_info = NULL; - TRACE("%p %p %p\n", This, bus, msg); + TRACE("filter %p, message type %s.\n", This, GST_MESSAGE_TYPE_NAME(msg)); if (GST_MESSAGE_TYPE(msg) & GST_MESSAGE_ERROR) { gst_message_parse_error(msg, &err, &dbg_info); @@ -2014,8 +2023,6 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) { struct cb_data *cbdata = user; - TRACE("got cb type: 0x%x\n", cbdata->type); - switch(cbdata->type) { case WATCH_BUS:

1 0

Zebediah Figura : winegstreamer: Use the "format" field to determine the subtype and bit depth.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 450d443b89d963774b9d662ce520210d7fa3738d URL: https://source.winehq.org/git/wine.git/?a=commit;h=450d443b89d963774b9d662c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:43:27 2019 -0500 winegstreamer: Use the "format" field to determine the subtype and bit depth. The "bits" field does not directly describe the total bit depth. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e76ceda0fe..c733b6e7e6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -207,16 +207,35 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) amt->pUnk = NULL; ZeroMemory(vih, sizeof(*vih)); amt->majortype = MEDIATYPE_Video; - if (GST_VIDEO_INFO_IS_RGB(&vinfo)) { - bih->biBitCount = GST_VIDEO_FORMAT_INFO_BITS(vinfo.finfo); - switch (bih->biBitCount) { - case 16: amt->subtype = MEDIASUBTYPE_RGB555; break; - case 24: amt->subtype = MEDIASUBTYPE_RGB24; break; - case 32: amt->subtype = MEDIASUBTYPE_RGB32; break; - default: - FIXME("Unknown bpp %u\n", bih->biBitCount); - heap_free(vih); - return FALSE; + + if (GST_VIDEO_INFO_IS_RGB(&vinfo)) + { + switch (vinfo.finfo->format) + { + case GST_VIDEO_FORMAT_BGRA: + amt->subtype = MEDIASUBTYPE_ARGB32; + bih->biBitCount = 32; + break; + case GST_VIDEO_FORMAT_BGRx: + amt->subtype = MEDIASUBTYPE_RGB32; + bih->biBitCount = 32; + break; + case GST_VIDEO_FORMAT_BGR: + amt->subtype = MEDIASUBTYPE_RGB24; + bih->biBitCount = 24; + break; + case GST_VIDEO_FORMAT_BGR16: + amt->subtype = MEDIASUBTYPE_RGB565; + bih->biBitCount = 16; + break; + case GST_VIDEO_FORMAT_BGR15: + amt->subtype = MEDIASUBTYPE_RGB555; + bih->biBitCount = 16; + break; + default: + FIXME("Unhandled type %s.\n", vinfo.finfo->name); + heap_free(vih); + return FALSE; } bih->biCompression = BI_RGB; } else {

1 0

Zebediah Figura : winegstreamer: Factor out amt_from_gst_caps().
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: c9a94b4de1be1ebc595ae382af372fdd44a2bb79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9a94b4de1be1ebc595ae382… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:43:28 2019 -0500 winegstreamer: Factor out amt_from_gst_caps(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 69 +++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c733b6e7e6..397af6ef55 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -121,7 +121,7 @@ BOOL is_wine_thread(void) return pthread_getspecific(wine_gst_key) != NULL; } -static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; WAVEFORMATEX *wfx; @@ -182,7 +182,7 @@ static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) return TRUE; } -static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_caps_video(const GstCaps *caps, AM_MEDIA_TYPE *amt) { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; @@ -271,36 +271,34 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) return TRUE; } +static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) +{ + const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + + if (!strcmp(type, "audio/x-raw")) + return amt_from_gst_caps_audio(caps, mt); + else if (!strcmp(type, "video/x-raw")) + return amt_from_gst_caps_video(caps, mt); + else + { + FIXME("Unhandled type %s.\n", debugstr_a(type)); + return FALSE; + } +} + static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); gchar *caps_str = gst_caps_to_string(caps); - AM_MEDIA_TYPE amt; - GstStructure *arg; - const char *typename; + AM_MEDIA_TYPE mt; gboolean ret; TRACE("pin %p, caps %s.\n", pin, debugstr_a(caps_str)); g_free(caps_str); - arg = gst_caps_get_structure(caps, 0); - typename = gst_structure_get_name(arg); - if (!strcmp(typename, "audio/x-raw")) { - ret = amt_from_gst_caps_audio(caps, &amt); - if (ret) - FreeMediaType(&amt); - TRACE("+%i\n", ret); - return ret; - } else if (!strcmp(typename, "video/x-raw")) { - ret = amt_from_gst_caps_video(caps, &amt); - if (ret) - FreeMediaType(&amt); - TRACE("-%i\n", ret); - return ret; - } else { - FIXME("Unhandled type \"%s\"\n", typename); - return FALSE; - } + if ((ret = amt_from_gst_caps(caps, &mt))) + FreeMediaType(&mt); + return ret; } static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) @@ -308,33 +306,20 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) struct gstdemux_source *pin = gst_pad_get_element_private(pad); struct gstdemux *filter = impl_from_strmbase_filter(pin->pin.pin.filter); gchar *caps_str = gst_caps_to_string(caps); - GstStructure *arg; - const char *typename; - gboolean ret; TRACE("filter %p, caps %s.\n", filter, debugstr_a(caps_str)); g_free(caps_str); FreeMediaType(&pin->mt); - arg = gst_caps_get_structure(caps, 0); - typename = gst_structure_get_name(arg); - if (!strcmp(typename, "audio/x-raw")) { - ret = amt_from_gst_caps_audio(caps, &pin->mt); - } else if (!strcmp(typename, "video/x-raw")) { - ret = amt_from_gst_caps_video(caps, &pin->mt); - if (ret) - { - VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; - filter->props.cbBuffer = max(filter->props.cbBuffer, vih->bmiHeader.biSizeImage); - } - } else { - FIXME("Unhandled type \"%s\"\n", typename); + if (!amt_from_gst_caps(caps, &pin->mt)) return FALSE; + + if (IsEqualGUID(&pin->mt.formattype, &FORMAT_VideoInfo)) + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + filter->props.cbBuffer = max(filter->props.cbBuffer, vih->bmiHeader.biSizeImage); } - TRACE("Linking returned %i for %s\n", ret, typename); - if (!ret) - return FALSE; SetEvent(pin->caps_event); return TRUE; }

1 0

Alex Henrie : ntdll: Avoid dead initialization (scan-build).
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 6ea282c7e1abd7ab09a5f0a18a437e63f909da96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea282c7e1abd7ab09a5f0a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:39:43 2019 -0600 ntdll: Avoid dead initialization (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 106fea80a3..d5f2f70273 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5569,7 +5569,7 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL const WCHAR *settings, WCHAR *buffer, SIZE_T size, SIZE_T *written ) { - ACTIVATION_CONTEXT *actctx = check_actctx( handle ); + ACTIVATION_CONTEXT *actctx; const WCHAR *res; if (flags)

1 0

Alex Henrie : user32: Avoid dead initialization (scan-build).
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 5644a10e9d27547ab4cbfaa54d50a55a4614457a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5644a10e9d27547ab4cbfaa5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:39:59 2019 -0600 user32: Avoid dead initialization (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 830097570a..31a6168108 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -248,7 +248,7 @@ static void dpiaware_init(void) static const WCHAR permonv2W[] = {'p','e','r','m','o','n','i','t','o','r','v','2',0}; static const WCHAR spacesW[] = {' ','\t','\r','\n',0}; static const WCHAR * const types[] = { unawareW, systemW, permonW, permonv2W }; - WCHAR *p, *start = buffer, *end; + WCHAR *p, *start, *end; ULONG_PTR i; TRACE( "got dpiAwareness=%s\n", debugstr_w(buffer) );

1 0

Alex Henrie : dbghelp: Avoid dead assignment (scan-build).
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: ae6e4017548fc30bf5220bebc674230dc4ccfe06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6e4017548fc30bf5220beb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:12 2019 -0600 dbghelp: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3689500fa0..69d8b38b71 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1967,7 +1967,6 @@ static BOOL re_match_multi(const WCHAR** pstring, const WCHAR** pre, BOOL _case) if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; string_end = next; } - re_beg = re_end; } if (*re_end || *string_end) return FALSE;

1 0

Alex Henrie : glu32: Avoid dead assignment (scan-build).
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 533e90ba9bef2ca8c807111c003d048b5c954d44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533e90ba9bef2ca8c807111c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:21 2019 -0600 glu32: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/mesh.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/glu32/mesh.c b/dlls/glu32/mesh.c index 895e9bb743..f545e870be 100644 --- a/dlls/glu32/mesh.c +++ b/dlls/glu32/mesh.c @@ -743,7 +743,6 @@ void __gl_meshCheckMesh( GLUmesh *mesh ) GLUvertex *v, *vPrev; GLUhalfEdge *e, *ePrev; - fPrev = fHead; for( fPrev = fHead ; (f = fPrev->next) != fHead; fPrev = f) { assert( f->prev == fPrev ); e = f->anEdge; @@ -758,7 +757,6 @@ void __gl_meshCheckMesh( GLUmesh *mesh ) } assert( f->prev == fPrev && f->anEdge == NULL && f->data == NULL ); - vPrev = vHead; for( vPrev = vHead ; (v = vPrev->next) != vHead; vPrev = v) { assert( v->prev == vPrev ); e = v->anEdge; @@ -773,7 +771,6 @@ void __gl_meshCheckMesh( GLUmesh *mesh ) } assert( v->prev == vPrev && v->anEdge == NULL && v->data == NULL ); - ePrev = eHead; for( ePrev = eHead ; (e = ePrev->next) != eHead; ePrev = e) { assert( e->Sym->next == ePrev->Sym ); assert( e->Sym != e );

1 0

Alex Henrie : crypt32: Factor out sprintf calls in trust_status_to_str (scan-build).
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 9b87b610ebb0820c9ffa7034efafa208769533e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b87b610ebb0820c9ffa7034… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:41:05 2019 -0600 crypt32: Factor out sprintf calls in trust_status_to_str (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 82 ++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index e7ed4e9bea..706ec75285 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -156,55 +156,41 @@ static BOOL import_base64_certs_from_fp(FILE *fp, HCERTSTORE store) static const char *trust_status_to_str(DWORD status) { + static const struct + { + DWORD flag; + char text[32]; + } + messages[] = + { + { CERT_TRUST_IS_NOT_TIME_VALID, "expired" }, + { CERT_TRUST_IS_NOT_TIME_NESTED, "bad time nesting" }, + { CERT_TRUST_IS_REVOKED, "revoked" }, + { CERT_TRUST_IS_NOT_SIGNATURE_VALID, "bad signature" }, + { CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "bad usage" }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, "untrusted root" }, + { CERT_TRUST_REVOCATION_STATUS_UNKNOWN, "unknown revocation status" }, + { CERT_TRUST_IS_CYCLIC, "cyclic chain" }, + { CERT_TRUST_INVALID_EXTENSION, "unsupported critical extension" }, + { CERT_TRUST_INVALID_POLICY_CONSTRAINTS, "bad policy" }, + { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, "bad basic constraints" }, + { CERT_TRUST_INVALID_NAME_CONSTRAINTS, "bad name constraints" }, + { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT, "unsupported name constraint" }, + { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, "undefined name constraint" }, + { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, "disallowed name constraint" }, + { CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, "excluded name constraint" }, + { CERT_TRUST_IS_OFFLINE_REVOCATION, "revocation server offline" }, + { CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY, "no issuance policy" }, + }; static char buf[1024]; - int pos = 0; - - if (status & CERT_TRUST_IS_NOT_TIME_VALID) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\texpired"); - if (status & CERT_TRUST_IS_NOT_TIME_NESTED) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad time nesting"); - if (status & CERT_TRUST_IS_REVOKED) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\trevoked"); - if (status & CERT_TRUST_IS_NOT_SIGNATURE_VALID) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad signature"); - if (status & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad usage"); - if (status & CERT_TRUST_IS_UNTRUSTED_ROOT) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tuntrusted root"); - if (status & CERT_TRUST_REVOCATION_STATUS_UNKNOWN) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunknown revocation status"); - if (status & CERT_TRUST_IS_CYCLIC) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tcyclic chain"); - if (status & CERT_TRUST_INVALID_EXTENSION) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsupported critical extension"); - if (status & CERT_TRUST_INVALID_POLICY_CONSTRAINTS) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad policy"); - if (status & CERT_TRUST_INVALID_BASIC_CONSTRAINTS) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tbad basic constraints"); - if (status & CERT_TRUST_INVALID_NAME_CONSTRAINTS) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tbad name constraints"); - if (status & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsupported name constraint"); - if (status & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tundefined name constraint"); - if (status & CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tdisallowed name constraint"); - if (status & CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\texcluded name constraint"); - if (status & CERT_TRUST_IS_OFFLINE_REVOCATION) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\trevocation server offline"); - if (status & CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tno issuance policy"); + int i, pos = 0; + + for (i = 0; i < ARRAY_SIZE(messages); i++) + { + if (status & messages[i].flag) + pos += sprintf(buf + pos, "\n\t%s", messages[i].text); + } + return buf; }

1 0

Alex Henrie : winex11: Avoid dead assignment (scan-build).
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 359eb9e5573db01edbd4849737cd20021c7281a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=359eb9e5573db01edbd48497… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:54 2019 -0600 winex11: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 311ecb58b7..7b2814e151 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1472,12 +1472,10 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d if (width_src < 0) { x_src += width_src + 1; - width_src = -width_src; } if (height_src < 0) { y_src += height_src + 1; - height_src = -height_src; } if (width_dst < 0) {

1 0