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

Zebediah Figura : evr: Use calloc() in evr_filter_create().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: b615eacd9e1d3125873ac40b1d96f4c0608e14b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b615eacd9e1d3125873ac40b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:15 2020 -0500 evr: Use calloc() in evr_filter_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index d6f6603eaa..e2caae31d3 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -46,7 +46,7 @@ static void evr_destroy(struct strmbase_renderer *iface) evr_filter *filter = impl_from_strmbase_renderer(iface); strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); } static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) @@ -72,16 +72,13 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) { evr_filter *object; - *out = NULL; - - object = CoTaskMemAlloc(sizeof(evr_filter)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, &CLSID_EnhancedVideoRenderer, L"EVR Input0", &renderer_ops); + TRACE("Created EVR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; - return S_OK; }

1 0

Zebediah Figura : evr: Get rid of the evr_filter typedef.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 20f90c1f89ef2c8f3f0a49ae4a91141dbea6b770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f90c1f89ef2c8f3f0a49ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:16 2020 -0500 evr: Get rid of the evr_filter typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index e2caae31d3..911075de33 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -31,19 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); -typedef struct +struct evr { struct strmbase_renderer renderer; -} evr_filter; +}; -static inline evr_filter *impl_from_strmbase_renderer(struct strmbase_renderer *iface) +static struct evr *impl_from_strmbase_renderer(struct strmbase_renderer *iface) { - return CONTAINING_RECORD(iface, evr_filter, renderer); + return CONTAINING_RECORD(iface, struct evr, renderer); } static void evr_destroy(struct strmbase_renderer *iface) { - evr_filter *filter = impl_from_strmbase_renderer(iface); + struct evr *filter = impl_from_strmbase_renderer(iface); strmbase_renderer_cleanup(&filter->renderer); free(filter); @@ -70,7 +70,7 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT evr_filter_create(IUnknown *outer, void **out) { - evr_filter *object; + struct evr *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : ntdll: Use wcscpy() instead of strcpyW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 18411a19b4ea3a68234980c56d4c252670dfc000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18411a19b4ea3a68234980c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:37:58 2020 +0200 ntdll: Use wcscpy() instead of strcpyW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 24 ++++++++++++------------ dlls/ntdll/directory.c | 2 +- dlls/ntdll/env.c | 6 +++--- dlls/ntdll/file.c | 1 - dlls/ntdll/loader.c | 16 ++++++++-------- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/locale.c | 8 ++++---- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 6 +++--- dlls/ntdll/reg.c | 2 +- dlls/ntdll/relay.c | 2 +- dlls/ntdll/rtl.c | 3 +-- dlls/ntdll/sec.c | 1 - dlls/ntdll/time.c | 2 +- dlls/ntdll/version.c | 4 ++-- 15 files changed, 40 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18411a19b4ea3a682349…

1 0

Alexandre Julliard : ntdll: Use wcscat() instead of strcatW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 80005ee016aeed42967adfe5b3042803d008c50d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80005ee016aeed42967adfe5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:41:22 2020 +0200 ntdll: Use wcscat() instead of strcatW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 28 ++++++++++++++-------------- dlls/ntdll/env.c | 6 +++--- dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/locale.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 6 +++--- dlls/ntdll/reg.c | 2 +- dlls/ntdll/version.c | 2 +- 9 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 03a18a1928..e52710565c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1099,17 +1099,17 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL; wcscpy( ret, arch ); - strcatW( ret, undW ); - strcatW( ret, name ); - strcatW( ret, undW ); - strcatW( ret, key ); - strcatW( ret, undW ); + wcscat( ret, undW ); + wcscat( ret, name ); + wcscat( ret, undW ); + wcscat( ret, key ); + wcscat( ret, undW ); NTDLL_swprintf( ret + strlenW(ret), version_formatW, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision ); - strcatW( ret, undW ); - strcatW( ret, lang ); - strcatW( ret, undW ); - strcatW( ret, mskeyW ); + wcscat( ret, undW ); + wcscat( ret, lang ); + wcscat( ret, undW ); + wcscat( ret, mskeyW ); return ret; } @@ -1118,7 +1118,7 @@ static inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHA WCHAR *p = buffer; if (!str) return; - strcatW( buffer, prefix ); + wcscat( buffer, prefix ); p += strlenW(p); *p++ = '"'; wcscpy( p, str ); @@ -3062,7 +3062,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, if (!(status = get_module_filename( module, &name, sizeof(dotManifestW) + 10*sizeof(WCHAR) ))) { if (resid != 1) NTDLL_swprintf( name.Buffer + strlenW(name.Buffer), fmtW, resid ); - strcatW( name.Buffer, dotManifestW ); + wcscat( name.Buffer, dotManifestW ); if (!RtlDosPathNameToNtPathName_U( name.Buffer, &nameW, NULL, NULL )) status = STATUS_RESOURCE_DATA_NOT_FOUND; RtlFreeUnicodeString( &name ); @@ -3076,7 +3076,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, return STATUS_NO_MEMORY; wcscpy( buffer, filename ); if (resid != 1) NTDLL_swprintf( buffer + strlenW(buffer), fmtW, resid ); - strcatW( buffer, dotManifestW ); + wcscat( buffer, dotManifestW ); RtlInitUnicodeString( &nameW, buffer ); } @@ -3700,8 +3700,8 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct strsec if (entity->u.class.versioned) { get_assembly_version(assembly, ptrW); - strcatW(ptrW, exclW); - strcatW(ptrW, entity->u.class.name); + wcscat(ptrW, exclW); + wcscat(ptrW, entity->u.class.name); } else { diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ecc2c38abb..f587bdef7e 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -689,7 +689,7 @@ static void get_image_path( const char *argv0, UNICODE_STRING *path ) if (RtlDoesFileExists_U( full_name )) goto done; if (len < (MAX_PATH - 4) * sizeof(WCHAR) && !strchrW( file_part, '.' )) { - strcatW( file_part, exeW ); + wcscat( file_part, exeW ); if (RtlDoesFileExists_U( full_name )) goto done; } /* check for builtin path inside system directory */ @@ -710,8 +710,8 @@ static void get_image_path( const char *argv0, UNICODE_STRING *path ) len = strlenW( system_dir ); if (strlenW( name ) >= MAX_PATH - 4 - len) goto failed; wcscpy( full_name, system_dir ); - strcatW( full_name, name ); - if (!strchrW( name, '.' )) strcatW( full_name, exeW ); + wcscat( full_name, name ); + if (!strchrW( name, '.' )) wcscat( full_name, exeW ); } } done: diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f67e1357ad..da19e74a76 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1775,8 +1775,8 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING (strlenW(system_dir) + len + 5) * sizeof(WCHAR) ))) return FALSE; wcscpy( fullname, nt_prefixW ); - strcatW( fullname, system_dir ); - strcatW( fullname, filenameW ); + wcscat( fullname, system_dir ); + wcscat( fullname, filenameW ); done: RtlInitUnicodeString( nt_name, fullname ); return TRUE; @@ -2860,7 +2860,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * { /* not found, return file in the system dir to be loaded as builtin */ wcscpy( name, system_dir ); - strcatW( name, search ); + wcscat( name, search ); if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; } else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; @@ -2896,7 +2896,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con (strlenW(libname)+strlenW(default_ext)+1) * sizeof(WCHAR)))) return STATUS_NO_MEMORY; wcscpy( dllname, libname ); - strcatW( dllname, default_ext ); + wcscat( dllname, default_ext ); libname = dllname; } } diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 35dd321e99..1a3c579dee 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -344,8 +344,8 @@ static HANDLE get_app_key( const WCHAR *app_name ) strlenW(app_name) * sizeof(WCHAR) ); if (!str) return 0; wcscpy( str, AppDefaultsW ); - strcatW( str, app_name ); - strcatW( str, DllOverridesW ); + wcscat( str, app_name ); + wcscat( str, DllOverridesW ); RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1487338cfa..88cfb08a6b 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -679,8 +679,8 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) return STATUS_NO_MEMORY; if (!RtlQueryEnvironmentVariable_U( NULL, &nameW, &valueW )) { - strcatW( valueW.Buffer, dataprefixW ); - strcatW( valueW.Buffer, name ); + wcscat( valueW.Buffer, dataprefixW ); + wcscat( valueW.Buffer, name ); valueW.Length = strlenW(valueW.Buffer) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); @@ -877,7 +877,7 @@ static LCID unix_locale_to_lcid( const char *unix_name ) wcscpy( win_name, buffer ); if (modifier) { - if (!strcmpW( modifier, latinW )) strcatW( win_name, latnW ); + if (!strcmpW( modifier, latinW )) wcscat( win_name, latnW ); else if (!strcmpW( modifier, euroW )) {} /* ignore */ else return 0; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 37128521dc..2a32660e72 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -303,6 +303,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) #define wcscpy(d,s) NTDLL_wcscpy(d,s) +#define wcscat(d,s) NTDLL_wcscat(d,s) #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) /* convert from straight ASCII to Unicode without depending on the current codepage */ diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 5804f8f53f..1666166181 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -399,7 +399,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U { case UNC_PATH: /* \\foo */ offset = 2; - strcatW(ntpath->Buffer, UncPfxW); + wcscat(ntpath->Buffer, UncPfxW); break; case DEVICE_PATH: /* \\.\foo */ offset = 4; @@ -409,7 +409,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U break; } - strcatW(ntpath->Buffer, ptr + offset); + wcscat(ntpath->Buffer, ptr + offset); ntpath->Length = strlenW(ntpath->Buffer) * sizeof(WCHAR); if (file_part && *file_part) @@ -514,7 +514,7 @@ ULONG WINAPI RtlDosSearchPath_U(LPCWSTR paths, LPCWSTR search, LPCWSTR ext, /* append '\\' if none is present */ if (needed > 0 && name[needed - 1] != '\\') name[needed++] = '\\'; wcscpy(&name[needed], search); - if (ext) strcatW(&name[needed], ext); + if (ext) wcscat(&name[needed], ext); if (RtlDoesFileExists_U(name)) { len = RtlGetFullPathName_U(name, buffer_size, buffer, file_part); diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 3ac66fb1c6..3170524884 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1193,7 +1193,7 @@ static NTSTATUS RTL_KeyHandleCreateObject(ULONG RelativeTo, PCWSTR Path, POBJECT return STATUS_NO_MEMORY; wcscpy(str->Buffer, base); - strcatW(str->Buffer, Path); + wcscat(str->Buffer, Path); str->Length = len - sizeof(WCHAR); str->MaximumLength = len; InitializeObjectAttributes(regkey, str, OBJ_CASE_INSENSITIVE, NULL, NULL); diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 8570a2fd51..87765d5562 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -505,7 +505,7 @@ void version_init(void) if ((p = strrchrW( appname, '\\' ))) appname = p + 1; wcscpy( appversion, appdefaultsW ); - strcatW( appversion, appname ); + wcscat( appversion, appname ); RtlInitUnicodeString( &nameW, appversion ); attr.RootDirectory = config_key;

1 0

Alexandre Julliard : ntdll: Use wcschr() instead of strchrW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 6de0ab276b3b79db4331993316f529a43f67c29a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de0ab276b3b79db43319933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:43:50 2020 +0200 ntdll: Use wcschr() instead of strchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 8 ++++---- dlls/ntdll/directory.c | 8 ++++---- dlls/ntdll/env.c | 12 ++++++------ dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/loadorder.c | 6 +++--- dlls/ntdll/locale.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 2 +- dlls/ntdll/printf.c | 2 +- dlls/ntdll/relay.c | 4 ++-- dlls/ntdll/rtlstr.c | 4 ++-- dlls/ntdll/version.c | 6 +++--- 12 files changed, 33 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de0ab276b3b79db4331…

1 0

Alexandre Julliard : ntdll: Use wcspbrk() instead of strpbrkW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 667fbe879199c042a5fe46072b06805b4811ea19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=667fbe879199c042a5fe4607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:46:29 2020 +0200 ntdll: Use wcspbrk() instead of strpbrkW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 10 +++++----- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 6e885b0b2c..1206a54f22 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -845,7 +845,7 @@ static LCID unix_locale_to_lcid( const char *unix_name ) if (len == ARRAY_SIZE(buffer)) return 0; buffer[len] = 0; - if (!(p = strpbrkW( buffer, sepW ))) + if (!(p = wcspbrk( buffer, sepW ))) { if (!strcmpW( buffer, posixW ) || !strcmpW( buffer, cW )) return MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); @@ -857,7 +857,7 @@ static LCID unix_locale_to_lcid( const char *unix_name ) { *p++ = 0; country = p; - p = strpbrkW( p, sepW + 1 ); + p = wcspbrk( p, sepW + 1 ); } if (p && *p == '.') { @@ -1674,16 +1674,16 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags if (strlenW( name ) >= LOCALE_NAME_MAX_LENGTH) return STATUS_INVALID_PARAMETER_1; wcscpy( lang, name ); - if ((p = strpbrkW( lang, sepW )) && *p == '-') + if ((p = wcspbrk( lang, sepW )) && *p == '-') { *p++ = 0; country = p; - if ((p = strpbrkW( p, sepW )) && *p == '-') + if ((p = wcspbrk( p, sepW )) && *p == '-') { *p++ = 0; script = country; country = p; - p = strpbrkW( p, sepW ); + p = wcspbrk( p, sepW ); } if (p) *p = 0; /* FIXME: modifier is ignored */ /* second value can be script or country, check length to resolve the ambiguity */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ca8d26ca82..e7df143cac 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -305,6 +305,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcscpy(d,s) NTDLL_wcscpy(d,s) #define wcscat(d,s) NTDLL_wcscat(d,s) #define wcschr(s,c) NTDLL_wcschr(s,c) +#define wcspbrk(s,a) NTDLL_wcspbrk(s,a) #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) /* convert from straight ASCII to Unicode without depending on the current codepage */

1 0

Alexandre Julliard : ntdll: Use wcsrchr() instead of strrchrW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 285c5490a4c0ee4a92d042a3e6ab32e6bc14fb49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=285c5490a4c0ee4a92d042a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:47:47 2020 +0200 ntdll: Use wcsrchr() instead of strrchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/loader.c | 16 ++++++++-------- dlls/ntdll/loadorder.c | 6 +++--- dlls/ntdll/nt.c | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 4 ++-- dlls/ntdll/process.c | 2 +- dlls/ntdll/relay.c | 2 +- dlls/ntdll/version.c | 4 ++-- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index fce6299446..4d402b5179 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3235,7 +3235,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit path[path_us.Length/sizeof(WCHAR)] = '\\'; wcscpy( path + path_us.Length/sizeof(WCHAR) + 1, file ); RtlInitUnicodeString( &path_us, path ); - *strrchrW(file, '.') = 0; /* remove .manifest extension */ + *wcsrchr(file, '.') = 0; /* remove .manifest extension */ if (!open_nt_file( &handle, &path_us )) { @@ -4998,7 +4998,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) else module = NtCurrentTeb()->Peb->ImageBaseAddress; if ((status = get_module_filename( module, &dir, 0 ))) goto error; - if ((p = strrchrW( dir.Buffer, '\\' ))) p[1] = 0; + if ((p = wcsrchr( dir.Buffer, '\\' ))) p[1] = 0; actctx->appdir.info = dir.Buffer; } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7f2a1ac109..30608204fc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1186,7 +1186,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.LoadCount = 1; RtlCreateUnicodeString( &wm->ldr.FullDllName, nt_name->Buffer + 4 /* \??\ prefix */ ); - if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; + if ((p = wcsrchr( wm->ldr.FullDllName.Buffer, '\\' ))) p++; else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); @@ -1756,7 +1756,7 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING ascii_to_unicode( filenameW, filename, len + 1 ); /* check if path can correspond to the dll we have */ - if (path && (p = strrchrW( path->Buffer, '\\' ))) + if (path && (p = wcsrchr( path->Buffer, '\\' ))) { p++; if (!wcsnicmp( p, filenameW, len ) && (!p[len] || !wcsicmp( p + len, soW ))) @@ -2101,8 +2101,8 @@ static inline const WCHAR *get_module_path_end( const WCHAR *module ) const WCHAR *p; const WCHAR *mod_end = module; - if ((p = strrchrW( mod_end, '\\' ))) mod_end = p; - if ((p = strrchrW( mod_end, '/' ))) mod_end = p; + if ((p = wcsrchr( mod_end, '\\' ))) mod_end = p; + if ((p = wcsrchr( mod_end, '/' ))) mod_end = p; if (mod_end == module + 2 && module[1] == ':') mod_end++; if (mod_end == module && module[0] && module[1] == ':') mod_end += 2; return mod_end; @@ -2683,8 +2683,8 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na /* Fix the name in case we have a full path and extension */ name = nt_name->Buffer; - if ((p = strrchrW( name, '\\' ))) name = p + 1; - if ((p = strrchrW( name, '/' ))) name = p + 1; + if ((p = wcsrchr( name, '\\' ))) name = p + 1; + if ((p = wcsrchr( name, '/' ))) name = p + 1; TRACE("Trying built-in %s\n", debugstr_w(name)); @@ -2761,7 +2761,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) goto done; } - if ((p = strrchrW( info->lpAssemblyManifestPath, '\\' ))) + if ((p = wcsrchr( info->lpAssemblyManifestPath, '\\' ))) { DWORD len, dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; @@ -2890,7 +2890,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con if (default_ext) /* first append default extension */ { - if (!(ext = strrchrW( libname, '.')) || wcschr( ext, '/' ) || wcschr( ext, '\\')) + if (!(ext = wcsrchr( libname, '.')) || wcschr( ext, '/' ) || wcschr( ext, '\\')) { if (!(dllname = RtlAllocateHeap( GetProcessHeap(), 0, (strlenW(libname)+strlenW(default_ext)+1) * sizeof(WCHAR)))) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 9d3364aa28..f7da2322f7 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -79,8 +79,8 @@ static const WCHAR *get_basename( const WCHAR *name ) const WCHAR *ptr; if (name[0] && name[1] == ':') name += 2; /* strip drive specification */ - if ((ptr = strrchrW( name, '\\' ))) name = ptr + 1; - if ((ptr = strrchrW( name, '/' ))) name = ptr + 1; + if ((ptr = wcsrchr( name, '\\' ))) name = ptr + 1; + if ((ptr = wcsrchr( name, '/' ))) name = ptr + 1; return name; } @@ -92,7 +92,7 @@ static const WCHAR *get_basename( const WCHAR *name ) static inline void remove_dll_ext( WCHAR *name ) { static const WCHAR dllW[] = {'.','d','l','l',0}; - WCHAR *p = strrchrW( name, '.' ); + WCHAR *p = wcsrchr( name, '.' ); if (p && !wcsicmp( p, dllW )) *p = 0; } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 660d5faf54..31f7221625 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2673,7 +2673,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( procname[wine_server_reply_size(reply) / sizeof(WCHAR)] = 0; /* Get only the executable name, not the path */ - if ((exename = strrchrW(procname, '\\')) != NULL) exename++; + if ((exename = wcsrchr(procname, '\\')) != NULL) exename++; else exename = procname; wlen = (strlenW(exename) + 1) * sizeof(WCHAR); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e7df143cac..baca280587 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -306,6 +306,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcscat(d,s) NTDLL_wcscat(d,s) #define wcschr(s,c) NTDLL_wcschr(s,c) #define wcspbrk(s,a) NTDLL_wcspbrk(s,a) +#define wcsrchr(s,c) NTDLL_wcsrchr(s,c) #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) /* convert from straight ASCII to Unicode without depending on the current codepage */ diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index feb50726f4..19b0f6c065 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -364,7 +364,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U ntpath->Buffer[1] = '?'; /* change \\?\ to \??\ */ if (file_part) { - if ((ptr = strrchrW( ntpath->Buffer, '\\' )) && ptr[1]) *file_part = ptr + 1; + if ((ptr = wcsrchr( ntpath->Buffer, '\\' )) && ptr[1]) *file_part = ptr + 1; else *file_part = NULL; } return STATUS_SUCCESS; @@ -855,7 +855,7 @@ DWORD WINAPI RtlGetFullPathName_U(const WCHAR* name, ULONG size, WCHAR* buffer, } /* find file part */ - if (file_part && (ptr = strrchrW(buffer, '\\')) != NULL && ptr >= buffer + 2 && *++ptr) + if (file_part && (ptr = wcsrchr(buffer, '\\')) != NULL && ptr >= buffer + 2 && *++ptr) *file_part = ptr; return reqsize; } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 67e7578076..3f54402d46 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1578,7 +1578,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, '.' )) && + (p = wcsrchr( params->ImagePathName.Buffer, '.' )) && (!wcsicmp( p, comW ) || !wcsicmp( p, pifW ))) status = STATUS_INVALID_IMAGE_WIN_16; diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 278e17dc21..350d96e2ef 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -223,7 +223,7 @@ static BOOL check_list( const WCHAR *module, int ordinal, const char *func, cons sprintf( ord_str, "%d", ordinal ); for(; *list; list++) { - const WCHAR *p = strrchrW( *list, '.' ); + const WCHAR *p = wcsrchr( *list, '.' ); if (p && p > *list) /* check module and function */ { int len = p - *list; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 803973c06e..3eb16a092e 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -501,8 +501,8 @@ void version_init(void) /* open AppDefaults\\appname key */ - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + if ((p = wcsrchr( appname, '/' ))) appname = p + 1; + if ((p = wcsrchr( appname, '\\' ))) appname = p + 1; wcscpy( appversion, appdefaultsW ); wcscat( appversion, appname );

1 0

Alexandre Julliard : ntdll: Use wcstoul() instead of strtoulW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 4b5cd5e66d31210007933f2b4460a2fde0b3df12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b5cd5e66d31210007933f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:49:15 2020 +0200 ntdll: Use wcstoul() instead of strtoulW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 30608204fc..9a88ea5e95 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3319,7 +3319,7 @@ static NTSTATUS query_dword_option( HANDLE hkey, LPCWSTR name, ULONG *value ) if (info->Type != REG_DWORD) { buffer[size / sizeof(WCHAR)] = 0; - *value = strtoulW( (WCHAR *)info->Data, 0, 16 ); + *value = wcstoul( (WCHAR *)info->Data, 0, 16 ); } else memcpy( value, info->Data, sizeof(*value) ); return status;

1 0

Alexandre Julliard : ntdll: Use wcslen() instead of strlenW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: e003b9884edcccc417d41d30073b312648741aaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e003b9884edcccc417d41d30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:50:16 2020 +0200 ntdll: Use wcslen() instead of strlenW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 130 ++++++++++++++++++++++++------------------------ dlls/ntdll/atom.c | 5 +- dlls/ntdll/directory.c | 12 ++--- dlls/ntdll/env.c | 29 ++++++----- dlls/ntdll/loader.c | 27 +++++----- dlls/ntdll/loadorder.c | 10 ++-- dlls/ntdll/locale.c | 22 ++++---- dlls/ntdll/nt.c | 3 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 23 ++++----- dlls/ntdll/printf.c | 5 +- dlls/ntdll/process.c | 12 ++--- dlls/ntdll/reg.c | 7 ++- dlls/ntdll/relay.c | 5 +- dlls/ntdll/resource.c | 2 +- dlls/ntdll/rtlstr.c | 9 ++-- 16 files changed, 147 insertions(+), 155 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e003b9884edcccc417d4…

1 0

Alexandre Julliard : ntdll: Use wcscspn() instead of strcspnW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 23bf63f9eb7546b4bb4a4bad03c7c83e6bac96b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23bf63f9eb7546b4bb4a4bad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:52:07 2020 +0200 ntdll: Use wcscspn() instead of strcspnW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 090ca8d96e..f4a92fda49 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -144,7 +144,7 @@ static enum loadorder parse_load_order( const WCHAR *order ) else if (ret == LO_NATIVE) return LO_NATIVE_BUILTIN; break; } - order += strcspnW( order, separatorsW ); + order += wcscspn( order, separatorsW ); } return ret; } @@ -208,7 +208,7 @@ static void add_load_order_set( WCHAR *entry ) while (*entry) { entry += strspnW( entry, separatorsW ); - end = entry + strcspnW( entry, separatorsW ); + end = entry + wcscspn( entry, separatorsW ); if (*end) *end++ = 0; if (*entry) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 65e4088b03..845efbbdbd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -309,6 +309,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcsrchr(s,c) NTDLL_wcsrchr(s,c) #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) #define wcslen(s) NTDLL_wcslen(s) +#define wcscspn(s,r) NTDLL_wcscspn(s,r) /* 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 )

1 0