wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Paul Gofman : d3dcompiler: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 2c8c06054e1497cd1be108005b0c6c538b6d3eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8c06054e1497cd1be10800… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 12:50:38 2020 +0300 d3dcompiler: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 820e5c239f..b29db47c71 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1674,13 +1674,13 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * if (d[i].Register == 0xffffffff) { - if (!_strnicmp(d[i].SemanticName, "sv_depth", -1)) + if (!stricmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; - else if (!_strnicmp(d[i].SemanticName, "sv_coverage", -1)) + else if (!stricmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; - else if (!_strnicmp(d[i].SemanticName, "sv_depthgreaterequal", -1)) + else if (!stricmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; - else if (!_strnicmp(d[i].SemanticName, "sv_depthlessequal", -1)) + else if (!stricmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; } else

1 0

Paul Gofman : mshtml: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 585d4fb742e7a2e6cb1f51d05a06f2226caaf6da URL: https://source.winehq.org/git/wine.git/?a=commit;h=585d4fb742e7a2e6cb1f51d0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:25:58 2020 +0300 mshtml: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0201ab5c47..7c8f029b4a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1180,7 +1180,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, nsACString_GetData(aRequestMethod, &method); for(i=0; i < ARRAY_SIZE(request_method_strings); i++) { - if(!_strnicmp(method, request_method_strings[i], -1)) { + if(!stricmp(method, request_method_strings[i])) { This->request_method = i; return NS_OK; }

1 0

Paul Gofman : wininet: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: de5d147de8b3d9c2f65bcb6d5646320ef1d92e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5d147de8b3d9c2f65bcb6d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:35:43 2020 +0300 wininet: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 2 +- dlls/wininet/internet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 94491689df..09dc1f36fb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3745,7 +3745,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - if(!_strnicmp(pszToken, "<DIR>", -1)) { + if(!stricmp(pszToken, "<DIR>")) { lpfp->bIsDirectory = TRUE; lpfp->nSize = 0; TRACE("Is directory\n"); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4b7cdad66e..fb02488934 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2371,7 +2371,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) int len_domain = strlen( domain ), len_suffix = strlen( suffix ); if (len_suffix > len_domain) return FALSE; - if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; + if (!stricmp( domain + len_domain - len_suffix, suffix )) return TRUE; return FALSE; }

1 0

Paul Gofman : winhttp: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: d7332c22dd05ef2d5aba3c4512ace5d440409316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7332c22dd05ef2d5aba3c45… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:33:54 2020 +0300 winhttp: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e647d71faf..dabbe9b195 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1395,7 +1395,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) int len_domain = strlen( domain ), len_suffix = strlen( suffix ); if (len_suffix > len_domain) return FALSE; - if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; + if (!stricmp( domain + len_domain - len_suffix, suffix )) return TRUE; return FALSE; }

1 0

Paul Gofman : wineps.drv: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: e0dcc8df14a243dbaa1fb3e0b4394ef2a9d325f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0dcc8df14a243dbaa1fb3e0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:31:39 2020 +0300 wineps.drv: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/font.c | 4 ++-- dlls/wineps.drv/mkagl.c | 2 +- dlls/wineps.drv/ppd.c | 20 ++++++++++---------- dlls/wineps.drv/type1afm.c | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 7617a46946..22397567aa 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -169,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, /* Look for a matching font family */ for(family = physDev->pi->Fonts; family; family = family->next) { - if(!_strnicmp(FaceName, family->FamilyName, -1)) + if(!stricmp(FaceName, family->FamilyName)) break; } diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index d6e330159c..cfb3669fd3 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -94,8 +94,8 @@ HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) for (i = 0; i < physDev->pi->FontSubTableSize; ++i) { - if (!_strnicmp (FaceName, - physDev->pi->FontSubTable[i].pValueName, -1)) + if (!stricmp (FaceName, + physDev->pi->FontSubTable[i].pValueName)) { TRACE ("substituting facename '%s' for '%s'\n", (LPSTR) physDev->pi->FontSubTable[i].pData, FaceName); diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index 788fb6ee77..d3ca67ee37 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -191,7 +191,7 @@ static void read_afms(FILE *f_c, FILE *f_h) int i, num_metrics; cp = strrchr(de->d_name, '.'); /* Does it end in */ - if (cp == NULL || _strnicmp(cp, ".afm", -1) != 0) /* .afm or .AFM? */ + if (cp == NULL || stricmp(cp, ".afm") != 0) /* .afm or .AFM? */ continue; f = fopen(de->d_name, "r"); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 662dbe6db7..03267c4370 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -746,7 +746,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*ColorDevice", tuple.key)) { - if(!_strnicmp(tuple.value, "true", -1)) + if(!stricmp(tuple.value, "true")) ppd->ColorDevice = CD_True; else ppd->ColorDevice = CD_False; @@ -964,13 +964,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*TTRasterizer", tuple.key)) { - if(!_strnicmp("None", tuple.value, -1)) + if(!stricmp("None", tuple.value)) ppd->TTRasterizer = RO_None; - else if(!_strnicmp("Accept68K", tuple.value, -1)) + else if(!stricmp("Accept68K", tuple.value)) ppd->TTRasterizer = RO_Accept68K; - else if(!_strnicmp("Type42", tuple.value, -1)) + else if(!stricmp("Type42", tuple.value)) ppd->TTRasterizer = RO_Type42; - else if(!_strnicmp("TrueImage", tuple.value, -1)) + else if(!stricmp("TrueImage", tuple.value)) ppd->TTRasterizer = RO_TrueImage; else { FIXME("Unknown option %s for *TTRasterizer\n", @@ -986,14 +986,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) duplex->Name = tuple.option; duplex->FullName = tuple.opttrans; duplex->InvocationString = tuple.value; - if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1) - || !_strnicmp("Simplex", tuple.option, -1)) + if(!stricmp("None", tuple.option) || !stricmp("False", tuple.option) + || !stricmp("Simplex", tuple.option)) duplex->WinDuplex = DMDUP_SIMPLEX; - else if(!_strnicmp("DuplexNoTumble", tuple.option, -1)) + else if(!stricmp("DuplexNoTumble", tuple.option)) duplex->WinDuplex = DMDUP_VERTICAL; - else if(!_strnicmp("DuplexTumble", tuple.option, -1)) + else if(!stricmp("DuplexTumble", tuple.option)) duplex->WinDuplex = DMDUP_HORIZONTAL; - else if(!_strnicmp("Notcapable", tuple.option, -1)) + else if(!stricmp("Notcapable", tuple.option)) duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index f29369b433..68cf6537b1 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -457,7 +457,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (_strnicmp(sz, "false", -1) == 0) + if (stricmp(sz, "false") == 0) { afm->IsFixedPitch = FALSE; *p_found = TRUE; @@ -465,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (_strnicmp(sz, "true", -1) == 0) + if (stricmp(sz, "true") == 0) { afm->IsFixedPitch = TRUE; *p_found = TRUE;

1 0

Paul Gofman : inetcomm: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 55be87932089c404a062ac9d62e2076fa32cf617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55be87932089c404a062ac9d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:22:42 2020 +0300 inetcomm: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2c481ab0d5..eda9a911bb 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -765,13 +765,13 @@ static void init_content_encoding(MimeBody *body, header_t *header) { const char *encoding = header->value.u.pszVal; - if(!_strnicmp(encoding, "base64", -1)) + if(!stricmp(encoding, "base64")) body->encoding = IET_BASE64; - else if(!_strnicmp(encoding, "quoted-printable", -1)) + else if(!stricmp(encoding, "quoted-printable")) body->encoding = IET_QP; - else if(!_strnicmp(encoding, "7bit", -1)) + else if(!stricmp(encoding, "7bit")) body->encoding = IET_7BIT; - else if(!_strnicmp(encoding, "8bit", -1)) + else if(!stricmp(encoding, "8bit")) body->encoding = IET_8BIT; else FIXME("unknown encoding %s\n", debugstr_a(encoding));

1 0

Paul Gofman : hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: aa769ad4a49d694db57b79d1562912c5da85717c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa769ad4a49d694db57b79d1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 27 13:20:34 2020 +0300 hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/chm.c | 2 +- dlls/hhctrl.ocx/content.c | 12 ++++++------ dlls/hhctrl.ocx/index.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 2d329b9d56..4d7b3a5a7f 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -595,7 +595,7 @@ WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document) TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "title", -1)) { + if(!stricmp(node_name.buf, "title")) { if(next_content(&stream, &content) && content.len > 1) { document_title = strdupnAtoW(&content.buf[1], content.len-1); diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 0bf374344d..32d7d1ab98 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -148,9 +148,9 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "/object", -1)) + if(!stricmp(node_name.buf, "/object")) break; - if(!_strnicmp(node_name.buf, "param", -1)) + if(!stricmp(node_name.buf, "param")) parse_obj_node_param(item, hhc_root, node.buf, info->pCHMInfo->codePage); strbuf_zero(&node); @@ -195,7 +195,7 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "object", -1)) { + if(!stricmp(node_name.buf, "object")) { const char *ptr; int len; @@ -210,10 +210,10 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro if(!ret) ret = prev; } - }else if(!_strnicmp(node_name.buf, "ul", -1)) { + }else if(!stricmp(node_name.buf, "ul")) { new_item = parse_ul(info, stream, hhc_root); insert_item(prev, new_item, INSERT_CHILD); - }else if(!_strnicmp(node_name.buf, "/ul", -1)) { + }else if(!stricmp(node_name.buf, "/ul")) { break; } @@ -245,7 +245,7 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, ContentItem *hhc_root, TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "ul", -1)) { + if(!stricmp(node_name.buf, "ul")) { ContentItem *item = parse_ul(info, &stream, hhc_root); prev = insert_item(prev, item, INSERT_CHILD); if(!ret) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 54151d0821..7d1625b6e6 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -137,9 +137,9 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "param", -1)) { + if(!stricmp(node_name.buf, "param")) { parse_index_obj_node_param(item, node.buf, info->pCHMInfo->codePage); - }else if(!_strnicmp(node_name.buf, "/object", -1)) { + }else if(!stricmp(node_name.buf, "/object")) { break; }else { WARN("Unhandled tag! %s\n", node_name.buf); @@ -173,7 +173,7 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "object", -1)) { + if(!stricmp(node_name.buf, "object")) { const char *ptr; int len; @@ -228,7 +228,7 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) TRACE("%s\n", node.buf); - if(!_strnicmp(node_name.buf, "li", -1)) { + if(!stricmp(node_name.buf, "li")) { IndexItem *new_item; new_item = parse_li(info, &stream); @@ -246,9 +246,9 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item) item = item->next; item->indentLevel = indent_level; } - }else if(!_strnicmp(node_name.buf, "ul", -1)) { + }else if(!stricmp(node_name.buf, "ul")) { indent_level++; - }else if(!_strnicmp(node_name.buf, "/ul", -1)) { + }else if(!stricmp(node_name.buf, "/ul")) { indent_level--; }else { WARN("Unhandled tag! %s\n", node_name.buf);

1 0

Zebediah Figura : winegstreamer: Set the bit depth for UYVY video.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: b9b2a04fe740d91495ca4bca88352b48e896ac1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9b2a04fe740d91495ca4bca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 27 00:54:29 2020 -0500 winegstreamer: Set the bit depth for UYVY video. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1dedad5135..2d9efe8ead 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -227,6 +227,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE bih->biBitCount = 12; break; case mmioFOURCC('Y','U','Y','2'): case mmioFOURCC('Y','V','Y','U'): + case mmioFOURCC('U','Y','V','Y'): bih->biBitCount = 16; break; } bih->biCompression = amt->subtype.Data1;

1 0

Zebediah Figura : winegstreamer: Flip only RGB video.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: bdf8f6753dac539ff05ce0e8049ae3ec95cbc3a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf8f6753dac539ff05ce0e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 27 00:54:28 2020 -0500 winegstreamer: Flip only RGB video. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b489c36f96..1dedad5135 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -77,6 +77,7 @@ struct gstdemux_source IQualityControl IQualityControl_iface; GstPad *their_src, *post_sink, *post_src, *my_sink; + GstElement *flip; AM_MEDIA_TYPE mt; HANDLE caps_event; GstSegment *segment; @@ -1010,7 +1011,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * return; } - /* GStreamer outputs video top-down, but DirectShow expects bottom-up. */ + /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ if (!(flip = gst_element_factory_make("videoflip", NULL))) { ERR("Failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", @@ -1018,8 +1019,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * return; } - gst_util_set_object_arg(G_OBJECT(flip), "method", "vertical-flip"); - gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ gst_element_sync_state_with_parent(vconv); gst_bin_add(GST_BIN(This->container), flip); /* bin takes ownership */ @@ -1029,6 +1028,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * pin->post_sink = gst_element_get_static_pad(vconv, "sink"); pin->post_src = gst_element_get_static_pad(flip, "src"); + pin->flip = flip; } else if (!strcmp(typename, "audio/x-raw")) { @@ -2053,6 +2053,9 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, { VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; buffer_size = format->bmiHeader.biSizeImage; + + gst_util_set_object_arg(G_OBJECT(pin->flip), "method", + format->bmiHeader.biCompression == BI_RGB ? "vertical-flip" : "none"); } else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM)

1 0

Francois Gouget : testbot/LogUtils: Highlight the failed -Werror build status lines.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: tools Branch: master Commit: 6529a06300ed400d4910a319d947978fb980e8bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=6529a06300ed400d4910a31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 25 23:43:58 2020 +0100 testbot/LogUtils: Highlight the failed -Werror build status lines. The compiler errors are already highlighted. But in case the Wine build really fails they will be shown twice: once with -Werror and once without. The -Werror build status line will show where the first build errors end and the second build errors start. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99c30e0..77837fb 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -280,6 +280,10 @@ sub ParseTaskLog($) { $LogInfo->{$1} = "updated"; } + elsif ($Line =~ /^Task: With -Werror the .* Wine build fails/) + { + ; # Show these non-fatal build errors + } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $LogInfo->{Task} = "failed";

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020