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

Alexandre Julliard : ntdll: Use RtlCompareUnicodeStrings() instead of strncmpiW().
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 2f7cc584ce09448e8f5434191210f0d217b2e437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7cc584ce09448e8f543419… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:39:44 2020 +0100 ntdll: Use RtlCompareUnicodeStrings() instead of strncmpiW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 6 +++--- dlls/ntdll/env.c | 18 ++++++++++++------ dlls/ntdll/loader.c | 8 +++++--- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c3da7347d7..53da0b0fc8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2102,7 +2102,7 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i { ret = ntdll_umbstowcs( kde[1].d_name, strlen(kde[1].d_name), buffer, MAX_DIR_ENTRY_LEN ); - if (ret == length && !strncmpiW( buffer, name, length)) + if (ret == length && !RtlCompareUnicodeStrings( buffer, ret, name, ret, TRUE )) { strcpy( unix_name + pos, kde[1].d_name ); RtlLeaveCriticalSection( &dir_section ); @@ -2112,7 +2112,7 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i } ret = ntdll_umbstowcs( kde[0].d_name, strlen(kde[0].d_name), buffer, MAX_DIR_ENTRY_LEN ); - if (ret == length && !strncmpiW( buffer, name, length)) + if (ret == length && !RtlCompareUnicodeStrings( buffer, ret, name, ret, TRUE )) { strcpy( unix_name + pos, kde[1].d_name[0] ? kde[1].d_name : kde[0].d_name ); @@ -2146,7 +2146,7 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i while ((de = readdir( dir ))) { ret = ntdll_umbstowcs( de->d_name, strlen(de->d_name), buffer, MAX_DIR_ENTRY_LEN ); - if (ret == length && !strncmpiW( buffer, name, length )) + if (ret == length && !RtlCompareUnicodeStrings( buffer, ret, name, ret, TRUE )) { strcpy( unix_name + pos, de->d_name ); closedir( dir ); diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index c8098e2d59..833da58f35 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -903,16 +903,20 @@ NTSTATUS WINAPI RtlDestroyEnvironment(PWSTR env) static LPCWSTR ENV_FindVariable(PCWSTR var, PCWSTR name, unsigned namelen) { - for (; *var; var += strlenW(var) + 1) + while (*var) { /* match var names, but avoid setting a var with a name including a '=' * (a starting '=' is valid though) */ - if (strncmpiW(var, name, namelen) == 0 && var[namelen] == '=' && - strchrW(var + 1, '=') == var + namelen) + unsigned int len = strlenW( var ); + if (len > namelen && + var[namelen] == '=' && + !RtlCompareUnicodeStrings( var, namelen, name, namelen, TRUE ) && + strchrW(var + 1, '=') == var + namelen) { return var + namelen + 1; } + var += len + 1; } return NULL; } @@ -987,7 +991,7 @@ void WINAPI RtlSetCurrentEnvironment(PWSTR new_env, PWSTR* old_env) NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, PUNICODE_STRING value) { - INT len, old_size; + INT varlen, len, old_size; LPWSTR p, env; NTSTATUS nts = STATUS_VARIABLE_NOT_FOUND; @@ -1011,9 +1015,11 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, old_size = get_env_length( env ); /* Find a place to insert the string */ - for (p = env; *p; p += strlenW(p) + 1) + for (p = env; *p; p += varlen + 1) { - if (!strncmpiW(name->Buffer, p, len) && (p[len] == '=')) break; + varlen = strlenW(p); + if (varlen > len && p[len] == '=' && + !RtlCompareUnicodeStrings( name->Buffer, len, p, len, TRUE )) break; } if (!value && !*p) goto done; /* Value to remove doesn't exist */ diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 735a7d21fc..fbbd29a595 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2768,10 +2768,12 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) if ((p = strrchrW( info->lpAssemblyManifestPath, '\\' ))) { - DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); - + DWORD len, dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (!dirlen || strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) + len = strlenW( p ); + if (!dirlen || len <= dirlen || + RtlCompareUnicodeStrings( p, dirlen, info->lpAssemblyDirectoryName, dirlen, TRUE ) || + 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 */

1 0

Alexandre Julliard : ntdll: Use the ascii_to_unicode() helper to compare relay module names.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: wine Branch: master Commit: 0d3ba59e138f97a52641093c0060e75b92efedb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d3ba59e138f97a52641093c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 13:40:37 2020 +0100 ntdll: Use the ascii_to_unicode() helper to compare relay module names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ------ dlls/ntdll/ntdll_misc.h | 6 ++++++ dlls/ntdll/relay.c | 28 +++++++++++++--------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fbbd29a595..8f607409f5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -185,12 +185,6 @@ static inline BOOL contains_path( LPCWSTR name ) return ((*name && (name[1] == ':')) || strchrW(name, '/') || strchrW(name, '\\')); } -/* convert from straight ASCII to Unicode without depending on the current codepage */ -static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) -{ - while (len--) *dst++ = (unsigned char)*src++; -} - #define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 typedef struct _RTL_UNLOAD_EVENT_TRACE diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 45ca35442f..953b29dfe5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -299,4 +299,10 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) #define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n) +/* convert from straight ASCII to Unicode without depending on the current codepage */ +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + #endif diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 9ebb973e9a..b4ea0a4dba 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -93,15 +93,6 @@ static inline int strcmpAW( const char *strA, const WCHAR *strW ) return (unsigned char)*strA - *strW; } -/* compare an ASCII and a Unicode string without depending on the current codepage */ -static inline int strncmpiAW( const char *strA, const WCHAR *strW, int n ) -{ - int ret = 0; - for ( ; n > 0; n--, strA++, strW++) - if ((ret = toupperW((unsigned char)*strA) - toupperW(*strW)) || !*strA) break; - return ret; -} - /*********************************************************************** * build_list * @@ -225,7 +216,7 @@ static DWORD WINAPI init_debug_lists( RTL_RUN_ONCE *once, void *param, void **co * * Check if a given module and function is in the list. */ -static BOOL check_list( const char *module, int ordinal, const char *func, const WCHAR *const *list ) +static BOOL check_list( const WCHAR *module, int ordinal, const char *func, const WCHAR *const *list ) { char ord_str[10]; @@ -236,7 +227,7 @@ static BOOL check_list( const char *module, int ordinal, const char *func, const if (p && p > *list) /* check module and function */ { int len = p - *list; - if (strncmpiAW( module, *list, len-1 ) || module[len]) continue; + if (wcsnicmp( module, *list, len - 1 ) || module[len]) continue; if (p[1] == '*' && !p[2]) return TRUE; if (!strcmpAW( ord_str, p + 1 )) return TRUE; if (func && !strcmpAW( func, p + 1 )) return TRUE; @@ -255,7 +246,7 @@ static BOOL check_list( const char *module, int ordinal, const char *func, const * * Check if a given function must be included in the relay output. */ -static BOOL check_relay_include( const char *module, int ordinal, const char *func ) +static BOOL check_relay_include( const WCHAR *module, int ordinal, const char *func ) { if (debug_relay_excludelist && check_list( module, ordinal, func, debug_relay_excludelist )) return FALSE; @@ -898,6 +889,7 @@ void RELAY_SetupDLL( HMODULE module ) DWORD size, entry_point_rva, old_prot; struct relay_descr *descr; struct relay_private_data *data; + WCHAR dllnameW[sizeof(data->dllname)]; const WORD *ordptr; void *func_base; SIZE_T func_size; @@ -923,6 +915,7 @@ void RELAY_SetupDLL( HMODULE module ) len = min( len, sizeof(data->dllname) - 1 ); memcpy( data->dllname, (char *)module + exports->Name, len ); data->dllname[len] = 0; + ascii_to_unicode( dllnameW, data->dllname, len + 1 ); /* fetch name pointer for all entry points and store them in the private structure */ @@ -944,7 +937,7 @@ void RELAY_SetupDLL( HMODULE module ) for (i = 0; i < exports->NumberOfFunctions; i++, funcs++) { if (!descr->entry_point_offsets[i]) continue; /* not a normal function */ - if (!check_relay_include( data->dllname, i + exports->Base, data->entry_points[i].name )) + if (!check_relay_include( dllnameW, i + exports->Base, data->entry_points[i].name )) continue; /* don't include this entry point */ data->entry_points[i].orig_func = (char *)module + *funcs; @@ -1035,9 +1028,14 @@ static SNOOP_RETURNENTRIES *firstrets; */ static BOOL SNOOP_ShowDebugmsgSnoop(const char *module, int ordinal, const char *func) { - if (debug_snoop_excludelist && check_list( module, ordinal, func, debug_snoop_excludelist )) + WCHAR moduleW[40]; + int len = strlen(module); + + if (len >= ARRAY_SIZE( moduleW )) return FALSE; + ascii_to_unicode( moduleW, module, len + 1 ); + if (debug_snoop_excludelist && check_list( moduleW, ordinal, func, debug_snoop_excludelist )) return FALSE; - if (debug_snoop_includelist && !check_list( module, ordinal, func, debug_snoop_includelist )) + if (debug_snoop_includelist && !check_list( moduleW, ordinal, func, debug_snoop_includelist )) return FALSE; return TRUE; }

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

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

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

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 : 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 : 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 : 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

Francois Gouget : testbot/build: Build Wine using -Werror if possible.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: tools Branch: master Commit: 4936ba2e33c0fbb131f45c97399c68bf57b2476f URL: https://source.winehq.org/git/tools.git/?a=commit;h=4936ba2e33c0fbb131f45c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 25 23:43:55 2020 +0100 testbot/build: Build Wine using -Werror if possible. Warnings are very dependent on the compiler version. So make sure the TestBot will not break in case the pristine source triggers a compiler warning: first try with -Werror and build without it as a fallback. Compiling the patches then uses the same settings. Let the BuildWine() callers specify whether to try compiling with -Werror to accommodate both the *Reconfig.pl and regular build cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 4 ++-- testbot/bin/build/Reconfig.pl | 14 ++++++++------ testbot/bin/build/WineReconfig.pl | 16 +++++++++------- testbot/bin/build/WineTest.pl | 6 +++--- testbot/lib/Build/Utils.pm | 26 ++++++++++++++++++++------ 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b2c13c8..23ab685 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -167,8 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - !BuildWine($TaskMissions, "no-rm", "exe32", undef, "buildtests") or - !BuildWine($TaskMissions, "no-rm", "exe64", undef, "buildtests")) + !BuildWine($TaskMissions, 0, "exe32", undef, "buildtests") or + !BuildWine($TaskMissions, 0, "exe64", undef, "buildtests")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index dd403ef..b72fa73 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -53,12 +53,13 @@ use WineTestBot::Missions; sub UpdateWineBuilds($$) { - my ($TaskMissions, $NoRm) = @_; + my ($TaskMissions, $Flags) = @_; + $Flags |= $Build::Utils::TRY_WERROR; my $Configure = "--without-x --without-freetype --disable-winetest"; - return BuildWine($TaskMissions, $NoRm, "exe32", + return BuildWine($TaskMissions, $Flags, "exe32", $Configure, "buildtests") && - BuildWine($TaskMissions, $NoRm, "exe64", + BuildWine($TaskMissions, $Flags, "exe64", "$Configure --enable-win64", "buildtests"); } @@ -67,7 +68,8 @@ sub UpdateWineBuilds($$) # Setup and command line processing # -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); +my ($Usage, $OptUpdate, $OptBuild, $MissionStatement); +my $OptBuildFlags = $Build::Utils::FROM_SCRATCH; while (@ARGV) { my $Arg = shift @ARGV; @@ -81,7 +83,7 @@ while (@ARGV) } elsif ($Arg eq "--no-rm") { - $OptNoRm = 1; + $OptBuildFlags &= ~$Build::Utils::FROM_SCRATCH; } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { @@ -180,7 +182,7 @@ exit(1) if ($OptBuild and !BuildNativeTestAgentd()); exit(1) if ($OptBuild and !BuildWindowsTestAgentd()); exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); -exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptBuildFlags)); LogMsg "ok\n"; exit; diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 383c6bf..0c64fc3 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -52,11 +52,12 @@ use WineTestBot::Utils qw(ShQuote); sub UpdateWineBuilds($$) { - my ($TaskMissions, $NoRm) = @_; + my ($TaskMissions, $Flags) = @_; - return BuildWine($TaskMissions, $NoRm, "win32", "") && - BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && - BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64=". + $Flags |= $Build::Utils::TRY_WERROR; + return BuildWine($TaskMissions, $Flags, "win32", "") && + BuildWine($TaskMissions, $Flags, "wow64", "--enable-win64") && + BuildWine($TaskMissions, $Flags, "wow32", "--with-wine64=". ShQuote("$DataDir/wine-wow64")); } @@ -107,7 +108,8 @@ sub UpdateWinePrefixes($) # Setup and command line processing # -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); +my ($Usage, $OptUpdate, $OptBuild, $OptAddOns, $OptWinePrefix, $MissionStatement); +my $OptBuildFlags = $Build::Utils::FROM_SCRATCH; while (@ARGV) { my $Arg = shift @ARGV; @@ -121,7 +123,7 @@ while (@ARGV) } elsif ($Arg eq "--no-rm") { - $OptNoRm = 1; + $OptBuildFlags &= ~$Build::Utils::FROM_SCRATCH; } elsif ($Arg eq "--addons") { @@ -234,7 +236,7 @@ exit(1) if ($OptBuild and !BuildNativeTestAgentd()); exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); -exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptBuildFlags)); exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($TaskMissions)); LogMsg "ok\n"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1a75076..84ba1cb 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -423,9 +423,9 @@ if ($Action eq "testpatch") { $Impacts = ApplyPatch("wine", "$DataDir/staging/$FileName"); exit(1) if (!$Impacts or - !BuildWine($TaskMissions, "no-rm", "win32", undef) or - !BuildWine($TaskMissions, "no-rm", "wow64", undef) or - !BuildWine($TaskMissions, "no-rm", "wow32", undef)); + !BuildWine($TaskMissions, 0, "win32", undef) or + !BuildWine($TaskMissions, 0, "wow64", undef) or + !BuildWine($TaskMissions, 0, "wow32", undef)); } foreach my $Mission (@{$TaskMissions->{Missions}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 3050be1..df236fa 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -317,22 +317,36 @@ sub BuildTestLauncher() return 1; } +our $FROM_SCRATCH = 1; +our $TRY_WERROR = 2; + sub BuildWine($$$$;$) { - my ($TaskMissions, $NoRm, $Build, $Configure, $Targets) = @_; + my ($TaskMissions, $Flags, $Build, $Configure, $Targets) = @_; $Targets ||= ""; return 1 if (!$TaskMissions->{Builds}->{$Build}); # Rebuild from scratch to make sure cruft will not accumulate - rmtree "$DataDir/wine-$Build" if (!$NoRm); + rmtree "$DataDir/wine-$Build" if ($Flags & $FROM_SCRATCH); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/wine-$Build' && set -x && ". - (defined $Configure ? "time ../wine/configure $Configure && " : ""). - "time make -j$CPUCount $Targets"); - if ($? != 0) + my $Rc = 1; + if (defined $Configure and ($Flags & $TRY_WERROR)) + { + $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". + "time ../wine/configure $Configure --enable-werror && ". + "time make -j$CPUCount $Targets"); + LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); + } + if ($Rc) + { + $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". + (defined $Configure ? "time ../wine/configure $Configure && " : ""). + "time make -j$CPUCount $Targets"); + } + if ($Rc) { LogMsg "The $Build Wine build failed\n"; return !1;

1 0