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

Francois Gouget : shell32/tests: Fix the temporary directory creation in shlexec.
by Alexandre Julliard March 27, 2020

March 27, 2020

Module: wine Branch: master Commit: fd7e5741aeb35f8c55869a9a8379712e85672c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7e5741aeb35f8c55869a9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 26 21:53:06 2020 +0100 shell32/tests: Fix the temporary directory creation in shlexec. Since the test no longer uses a random directory name, the directory is more likely to exist already. So use it even if it already exists. Also on some Windows versions (e.g. Windos 2008) GetLongPathName() does not return the long name if the path does not exist. So do the conversion before appending the new directory name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b49297bb41..8ee662321d 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2693,16 +2693,17 @@ static void init_test(void) strcpy(tmpdir, "c:\\"); else GetTempPathA(sizeof(tmpdir), tmpdir); + GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); /* In case of a failure it is necessary to show the path that was passed to * ShellExecute(). That means the paths must not be randomized so as not to * prevent the TestBot from detecting new failures. */ strcat(tmpdir, "wtShlexecDir"); - GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); - ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + ok( rc || GetLastError() == ERROR_ALREADY_EXISTS, + "failed to create %s err %u\n", tmpdir, GetLastError() ); /* Set %TMPDIR% for the tests */ SetEnvironmentVariableA("TMPDIR", tmpdir);

1 0

Alexandre Julliard : ntdll: Use wcsicmp() instead of strcmpiW() where possible.
by Alexandre Julliard March 27, 2020

March 27, 2020

Module: wine Branch: master Commit: 3e049b6b962b8e6f048101b9910c09d5b1d8f167 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e049b6b962b8e6f048101b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:38:09 2020 +0100 ntdll: Use wcsicmp() instead of strcmpiW() where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 2 +- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/loadorder.c | 2 +- dlls/ntdll/locale.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/path.c | 2 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/relay.c | 4 ++-- dlls/ntdll/version.c | 6 +++--- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 17f9cad084..236adf6c00 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3101,7 +3101,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) unsigned int data_pos = 0, data_len; char buffer[8192]; - if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; + if (!lang || !wcsicmp( lang, neutralW )) lang = wildcardW; if (!(lookup = RtlAllocateHeap( GetProcessHeap(), 0, (strlenW(ai->arch) + strlenW(ai->name) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1b641f1b9d..7aef68e39e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -951,7 +951,7 @@ static BOOL is_dll_native_subsystem( LDR_MODULE *mod, const IMAGE_NT_HEADERS *nt DWORD len = strlen(name); if (len * sizeof(WCHAR) >= sizeof(buffer)) continue; ascii_to_unicode( buffer, name, len + 1 ); - if (!strcmpiW( buffer, ntdllW ) || !strcmpiW( buffer, kernel32W )) + if (!wcsicmp( buffer, ntdllW ) || !wcsicmp( buffer, kernel32W )) { TRACE( "%s imports %s, assuming not native\n", debugstr_w(filename), debugstr_w(buffer) ); return FALSE; @@ -1761,7 +1761,7 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING p++; for (i = 0; i < len; i++) if (tolowerW(p[i]) != tolowerW( (WCHAR)filename[i]) ) break; - if (i == len && (!p[len] || !strcmpiW( p + len, soW ))) + if (i == len && (!p[len] || !wcsicmp( p + len, soW ))) { /* the filename matches, use path as the full path */ len += p - path->Buffer; @@ -2768,7 +2768,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (!dirlen || strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || strcmpiW( p + dirlen, dotManifestW )) + if (!dirlen || strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index b965b96011..2d82b12a7a 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -65,7 +65,7 @@ static struct loadorder_list env_list; */ static int cmp_sort_func(const void *s1, const void *s2) { - return strcmpiW(((const module_loadorder_t *)s1)->modulename, ((const module_loadorder_t *)s2)->modulename); + return wcsicmp(((const module_loadorder_t *)s1)->modulename, ((const module_loadorder_t *)s2)->modulename); } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1be3086a1e..ea629e8393 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1703,13 +1703,13 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags if (PRIMARYLANGID(id) == LANG_NEUTRAL) continue; - if (!load_string( LOCALE_SNAME, id, buf, ARRAY_SIZE(buf) ) && !strcmpiW( name, buf )) + if (!load_string( LOCALE_SNAME, id, buf, ARRAY_SIZE(buf) ) && !wcsicmp( name, buf )) { *lcid = MAKELCID( id, SORT_DEFAULT ); /* FIXME: handle sort order */ goto found; } - if (load_string( LOCALE_SISO639LANGNAME, id, buf, ARRAY_SIZE(buf) ) || strcmpiW( lang, buf )) + if (load_string( LOCALE_SISO639LANGNAME, id, buf, ARRAY_SIZE(buf) ) || wcsicmp( lang, buf )) continue; if (script) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1e83478ce6..c22b32a5b7 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -296,4 +296,6 @@ LPWSTR __cdecl NTDLL_wcstok( LPWSTR str, LPCWSTR delim ); LONG __cdecl NTDLL_wcstol( LPCWSTR s, LPWSTR *end, INT base ); ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); +#define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) + #endif diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 610646be85..adbfb4f526 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -280,7 +280,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) case UNC_PATH: return 0; case DEVICE_PATH: - if (!strcmpiW( dos_name, consoleW )) + if (!wcsicmp( dos_name, consoleW )) return MAKELONG( sizeof(conW), 4 * sizeof(WCHAR) ); /* 4 is length of \\.\ prefix */ return 0; case ABSOLUTE_DRIVE_PATH: diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 78e112bd3a..2290d5d186 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1579,7 +1579,7 @@ NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) /* check for .com or .pif extension */ if (status == STATUS_INVALID_IMAGE_NOT_MZ && (p = strrchrW( params->ImagePathName.Buffer, '.' )) && - (!strcmpiW( p, comW ) || !strcmpiW( p, pifW ))) + (!wcsicmp( p, comW ) || !wcsicmp( p, pifW ))) status = STATUS_INVALID_IMAGE_WIN_16; switch (status) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 04957acf7b..b5db930e12 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -292,9 +292,9 @@ static BOOL check_from_module( const WCHAR **includelist, const WCHAR **excludel { int len; - if (!strcmpiW( *listitem, module )) return !show; + if (!wcsicmp( *listitem, module )) return !show; len = strlenW( *listitem ); - if (!strncmpiW( *listitem, module, len ) && !strcmpiW( module + len, dllW )) + if (!strncmpiW( *listitem, module, len ) && !wcsicmp( module + len, dllW )) return !show; } return show; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 61e48f6fbd..4994dbbb5e 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -343,9 +343,9 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) { WCHAR *str = (WCHAR *)info->Data; str[info->DataLength / sizeof(WCHAR)] = 0; - if (!strcmpiW( str, WinNTW )) version->wProductType = VER_NT_WORKSTATION; - else if (!strcmpiW( str, LanmanNTW )) version->wProductType = VER_NT_DOMAIN_CONTROLLER; - else if (!strcmpiW( str, ServerNTW )) version->wProductType = VER_NT_SERVER; + if (!wcsicmp( str, WinNTW )) version->wProductType = VER_NT_WORKSTATION; + else if (!wcsicmp( str, LanmanNTW )) version->wProductType = VER_NT_DOMAIN_CONTROLLER; + else if (!wcsicmp( str, ServerNTW )) version->wProductType = VER_NT_SERVER; } NtClose( hkey2 ); }

1 0

Paul Gofman : wininet: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard March 27, 2020

March 27, 2020

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 : inetcomm: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard March 27, 2020

March 27, 2020

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 : winhttp: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard March 27, 2020

March 27, 2020

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 : hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard March 27, 2020

March 27, 2020

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: Flip only RGB video.
by Alexandre Julliard March 27, 2020

March 27, 2020

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

Zebediah Figura : winegstreamer: Set the bit depth for UYVY video.
by Alexandre Julliard March 27, 2020

March 27, 2020

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

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

March 27, 2020

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

Francois Gouget : testbot/LogUtils: Highlight the failed -Werror build status lines.
by Alexandre Julliard March 27, 2020

March 27, 2020

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