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

Zebediah Figura : qedit/samplegrabber: Get rid of the SG_Impl typedef.
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 933195d0b6f4843c07994ac737e3529d07918350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=933195d0b6f4843c07994ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:12 2020 -0500 qedit/samplegrabber: Get rid of the SG_Impl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 96 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=933195d0b6f4843c0799…

1 0

Alexandre Julliard : ntdll: Use wcstoul() instead of strtoulW().
by Alexandre Julliard March 31, 2020

March 31, 2020

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

Zebediah Figura : evr: Get rid of the evr_filter typedef.
by Alexandre Julliard March 31, 2020

March 31, 2020

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

Zebediah Figura : qedit/nullrenderer: Get rid of the NullRendererImpl typedef.
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 5217d17170c1d066905ae90f172f2fbdb99abc7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5217d17170c1d066905ae90f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:14 2020 -0500 qedit/nullrenderer: Get rid of the NullRendererImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 61de792750..e703ea2430 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -26,14 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -typedef struct NullRendererImpl +struct null_renderer { struct strmbase_renderer renderer; -} NullRendererImpl; +}; -static inline NullRendererImpl *impl_from_strmbase_renderer(struct strmbase_renderer *iface) +static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) { - return CONTAINING_RECORD(iface, NullRendererImpl, renderer); + return CONTAINING_RECORD(iface, struct null_renderer, renderer); } static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) @@ -49,7 +49,7 @@ static HRESULT WINAPI NullRenderer_CheckMediaType(struct strmbase_renderer *ifac static void null_renderer_destroy(struct strmbase_renderer *iface) { - NullRendererImpl *filter = impl_from_strmbase_renderer(iface); + struct null_renderer *filter = impl_from_strmbase_renderer(iface); strmbase_renderer_cleanup(&filter->renderer); free(filter); @@ -64,7 +64,7 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) { - NullRendererImpl *object; + struct null_renderer *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : ntdll: Use wcscmp() instead of strcmpW().
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 4501ab0a7c80e31e602c540a446809e8ae3ebade URL: https://source.winehq.org/git/wine.git/?a=commit;h=4501ab0a7c80e31e602c540a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:54:39 2020 +0200 ntdll: Use wcscmp() instead of strcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 20 ++++++++++---------- dlls/ntdll/directory.c | 2 +- dlls/ntdll/locale.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/time.c | 3 +-- dlls/ntdll/version.c | 3 +-- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 0c0d0f41a8..6612e33cee 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -779,12 +779,12 @@ static inline BOOL xml_elem_cmp(const struct xml_elem *elem, const WCHAR *str, c { if (!xmlstr_cmp( &elem->name, str )) return FALSE; if (xmlstr_cmp( &elem->ns, namespace )) return TRUE; - if (!strcmpW( namespace, asmv1W )) + if (!wcscmp( namespace, asmv1W )) { if (xmlstr_cmp( &elem->ns, asmv2W )) return TRUE; if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; } - else if (!strcmpW( namespace, asmv2W )) + else if (!wcscmp( namespace, asmv2W )) { if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; } @@ -1014,7 +1014,7 @@ static BOOL is_matching_identity( const struct assembly_identity *id1, if (id1->language && id2->language && !is_matching_string( id1->language, id2->language )) { - if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) + if (wcscmp( wildcardW, id1->language ) && wcscmp( wildcardW, id2->language )) return FALSE; } if (id1->version.major != id2->version.major) return FALSE; @@ -2235,7 +2235,7 @@ static void parse_dependent_assembly_elem( xmlbuf_t *xmlbuf, struct actctx_loade { parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai, &elem); /* store the newly found identity for later loading */ - if (ai.arch && !strcmpW(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); + if (ai.arch && !wcscmp(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); TRACE( "adding name=%s version=%s arch=%s\n", debugstr_w(ai.name), debugstr_version(&ai.version), debugstr_w(ai.arch) ); if (!add_dependent_assembly_id(acl, &ai)) set_error( xmlbuf ); @@ -4926,8 +4926,8 @@ static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR * { struct entity *entity = &assembly->entities.base[j]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS && - !strcmpW( entity->u.settings.name, settings ) && - !strcmpW( entity->u.settings.ns, ns )) + !wcscmp( entity->u.settings.name, settings ) && + !wcscmp( entity->u.settings.ns, ns )) return entity->u.settings.value; } } @@ -5589,10 +5589,10 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL if (ns) { - if (strcmpW( ns, windowsSettings2005NSW ) && - strcmpW( ns, windowsSettings2011NSW ) && - strcmpW( ns, windowsSettings2016NSW ) && - strcmpW( ns, windowsSettings2017NSW )) + if (wcscmp( ns, windowsSettings2005NSW ) && + wcscmp( ns, windowsSettings2011NSW ) && + wcscmp( ns, windowsSettings2016NSW ) && + wcscmp( ns, windowsSettings2017NSW )) return STATUS_INVALID_PARAMETER; } else ns = windowsSettings2005NSW; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f41b11ec76..436ddf5366 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1820,7 +1820,7 @@ static int name_compare( const void *a, const void *b ) const struct dir_data_names *file_b = (const struct dir_data_names *)b; int ret = RtlCompareUnicodeStrings( file_a->long_name, wcslen(file_a->long_name), file_b->long_name, wcslen(file_b->long_name), TRUE ); - if (!ret) ret = strcmpW( file_a->long_name, file_b->long_name ); + if (!ret) ret = wcscmp( file_a->long_name, file_b->long_name ); return ret; } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1611a52f1a..9773284f63 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -847,7 +847,7 @@ static LCID unix_locale_to_lcid( const char *unix_name ) if (!(p = wcspbrk( buffer, sepW ))) { - if (!strcmpW( buffer, posixW ) || !strcmpW( buffer, cW )) + if (!wcscmp( buffer, posixW ) || !wcscmp( buffer, cW )) return MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); wcscpy( win_name, buffer ); } @@ -877,8 +877,8 @@ static LCID unix_locale_to_lcid( const char *unix_name ) wcscpy( win_name, buffer ); if (modifier) { - if (!strcmpW( modifier, latinW )) wcscat( win_name, latnW ); - else if (!strcmpW( modifier, euroW )) {} /* ignore */ + if (!wcscmp( modifier, latinW )) wcscat( win_name, latnW ); + else if (!wcscmp( modifier, euroW )) {} /* ignore */ else return 0; } if (country) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1249acbcdd..a81e13659e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -311,6 +311,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcslen(s) NTDLL_wcslen(s) #define wcscspn(s,r) NTDLL_wcscspn(s,r) #define wcsspn(s,a) NTDLL_wcsspn(s,a) +#define wcscmp(s1,s2) NTDLL_wcscmp(s1,s2) /* 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 ) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 21b25df3f3..b42a621aa2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -47,7 +47,6 @@ #include "windef.h" #include "winternl.h" #include "wine/exception.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -662,7 +661,7 @@ static int compare_tz_key(const void *a, const void *b) const struct tz_name_map *map_a, *map_b; map_a = (const struct tz_name_map *)a; map_b = (const struct tz_name_map *)b; - return strcmpW(map_a->key_name, map_b->key_name); + return wcscmp(map_a->key_name, map_b->key_name); } static BOOL match_tz_name(const char* tz_name, diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 3eb16a092e..bb47e39f58 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -31,7 +31,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "ddk/wdm.h" @@ -458,7 +457,7 @@ static BOOL parse_win_version( HANDLE hkey ) for (i = 0; i < ARRAY_SIZE(version_names); i++) { - if (strcmpW( version_names[i].name, name )) continue; + if (wcscmp( version_names[i].name, name )) continue; current_version = &VersionData[version_names[i].ver]; TRACE( "got win version %s\n", debugstr_w(version_names[i].name) ); return TRUE;

1 0

Alexandre Julliard : ntdll: Use wcsspn() instead of strspnW().
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 0d1b7737e37e67389f51bae3bf820b90f109f329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d1b7737e37e67389f51bae3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:53:34 2020 +0200 ntdll: Use wcsspn() instead of strspnW(). 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 f4a92fda49..291cc76031 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -130,7 +130,7 @@ static enum loadorder parse_load_order( const WCHAR *order ) while (*order) { - order += strspnW( order, separatorsW ); + order += wcsspn( order, separatorsW ); switch(*order) { case 'N': /* native */ @@ -207,7 +207,7 @@ static void add_load_order_set( WCHAR *entry ) while (*entry) { - entry += strspnW( entry, separatorsW ); + entry += wcsspn( 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 845efbbdbd..1249acbcdd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -310,6 +310,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) #define wcslen(s) NTDLL_wcslen(s) #define wcscspn(s,r) NTDLL_wcscspn(s,r) +#define wcsspn(s,a) NTDLL_wcsspn(s,a) /* 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

Alexandre Julliard : ntdll: Use wcscspn() instead of strcspnW().
by Alexandre Julliard March 31, 2020

March 31, 2020

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

Alexandre Julliard : ntdll: Use wcslen() instead of strlenW().
by Alexandre Julliard March 31, 2020

March 31, 2020

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 wcsrchr() instead of strrchrW().
by Alexandre Julliard March 31, 2020

March 31, 2020

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

Zebediah Figura : qedit/samplegrabber: Use calloc() in sample_grabber_create().
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 218c382fd4dd69385c46a364f5a514f88d86320a URL: https://source.winehq.org/git/wine.git/?a=commit;h=218c382fd4dd69385c46a364… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:11 2020 -0500 qedit/samplegrabber: Use calloc() in sample_grabber_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index afb48bf84d..90e4102afa 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -107,7 +107,7 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_passthrough_cleanup(&filter->passthrough); strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); + free(filter); } static HRESULT sample_grabber_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -639,32 +639,27 @@ static const struct strmbase_source_ops source_ops = HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) { - SG_Impl* obj = NULL; + SG_Impl *object; - obj = CoTaskMemAlloc(sizeof(SG_Impl)); - if (NULL == obj) { - *out = NULL; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - } - ZeroMemory(obj, sizeof(SG_Impl)); - strmbase_filter_init(&obj->filter, outer, &CLSID_SampleGrabber, &filter_ops); - obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; - obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; + strmbase_filter_init(&object->filter, outer, &CLSID_SampleGrabber, &filter_ops); + object->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; + object->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; - strmbase_sink_init(&obj->sink, &obj->filter, L"In", &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); - strmbase_source_init(&obj->source, &obj->filter, L"Out", &source_ops); - strmbase_passthrough_init(&obj->passthrough, (IUnknown *)&obj->source.pin.IPin_iface); - ISeekingPassThru_Init(&obj->passthrough.ISeekingPassThru_iface, FALSE, &obj->sink.pin.IPin_iface); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); + ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, + &object->sink.pin.IPin_iface); - obj->allocator = NULL; - obj->grabberIface = NULL; - obj->grabberMethod = -1; - obj->oneShot = OneShot_None; - obj->bufferLen = -1; - obj->bufferData = NULL; + object->grabberMethod = -1; + object->oneShot = OneShot_None; + object->bufferLen = -1; - *out = &obj->filter.IUnknown_inner; + TRACE("Created sample grabber %p.\n", object); + *out = &object->filter.IUnknown_inner; return S_OK; }

1 0