wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Michael Stefaniuc : dmstyle: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: b49cab9a17b2e26d71cb31d7a6047899b2a605d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49cab9a17b2e26d71cb31d7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:32 2018 +0200 dmstyle: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index e551410..23cddc0 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -438,7 +438,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -482,7 +482,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {

1 0

Michael Stefaniuc : dmscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 675ec4662b99a6e08dd2119f683e931e6daa2653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=675ec4662b99a6e08dd2119f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:31 2018 +0200 dmscript: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/dmscript_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 6a3c686..fd25b00 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -436,7 +436,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -480,7 +480,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump whole DMUS_OBJECTDESC struct */

1 0

Michael Stefaniuc : dmloader: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 47e57c58b6833c535fd387ffdec26448344de369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e57c58b6833c535fd387ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:30 2018 +0200 dmloader: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/debug.c | 10 +++++----- dlls/dmloader/loader.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 9d48776..d072391 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -269,7 +269,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -416,7 +416,7 @@ const char *debugstr_dmreturn (DWORD code) { }; unsigned int i; - for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++) { + for (i = 0; i < ARRAY_SIZE(codes); i++) { if (code == codes[i].val) return codes[i].name; } @@ -461,7 +461,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump DMUS_CONTAINER flags */ @@ -469,7 +469,7 @@ static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINER_NOLOADS) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump DMUS_CONTAINED_OBJF flags */ @@ -477,7 +477,7 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINED_OBJF_KEEP) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* Dump whole DMUS_OBJECTDESC struct */ diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 10a2151..8b979da 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -894,9 +894,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_LoadObjectFromFile(IDirectMusicLoad */ get_search_path(This, rguidClassID, wszLoaderSearchPath); /* search in current directory */ - if (!SearchPathW (NULL, pwzFilePath, NULL, sizeof(ObjDesc.wszFileName)/sizeof(WCHAR), ObjDesc.wszFileName, NULL) && + if (!SearchPathW(NULL, pwzFilePath, NULL, ARRAY_SIZE(ObjDesc.wszFileName), ObjDesc.wszFileName, NULL) && /* search in loader's search path */ - !SearchPathW (wszLoaderSearchPath, pwzFilePath, NULL, sizeof(ObjDesc.wszFileName)/sizeof(WCHAR), ObjDesc.wszFileName, NULL)) { + !SearchPathW(wszLoaderSearchPath, pwzFilePath, NULL, ARRAY_SIZE(ObjDesc.wszFileName), ObjDesc.wszFileName, NULL)) { /* cannot find file */ TRACE(": cannot find file\n"); return DMUS_E_LOADER_FAILEDOPEN;

1 0

Michael Stefaniuc : dmime: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 4059759ccd34870c4119aece00e7b68eba53ca60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4059759ccd34870c4119aece… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:29 2018 +0200 dmime: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index c51d579..cb5fd32 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -386,7 +386,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -430,7 +430,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) {

1 0

Michael Stefaniuc : dmband: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 94c74a045f7b659078be9ae090db70a2a28ef048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c74a045f7b659078be9ae0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:27 2018 +0200 dmband: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index b121564..e04e9dd 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -82,7 +82,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* month number into month name (for debugstr_filetime) */ @@ -506,7 +506,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; }

1 0

Michael Stefaniuc : dmcompos: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: de78764ceaec8b5b66ac9f8a0d1c609f5b1a79cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=de78764ceaec8b5b66ac9f8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:28 2018 +0200 dmcompos: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/dmcompos_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index c15c97d..2e68775 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -406,7 +406,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -450,7 +450,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump whole DMUS_OBJECTDESC struct */

1 0

Francois Gouget : winemenubuilder: Avoid unneeded lstrlenA() calls.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: f18d35753a0b6f5df702b177fd2fa56eb1fb7e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18d35753a0b6f5df702b177… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:54:15 2018 +0200 winemenubuilder: Avoid unneeded lstrlenA() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9adfed6..26710e9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1468,13 +1468,13 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con wine_get_config_dir(), path, args); fprintf(file, "Type=Application\n"); fprintf(file, "StartupNotify=true\n"); - if (descr && lstrlenA(descr)) + if (descr && *descr) fprintf(file, "Comment=%s\n", descr); - if (workdir && lstrlenA(workdir)) + if (workdir && *workdir) fprintf(file, "Path=%s\n", workdir); - if (icon && lstrlenA(icon)) + if (icon && *icon) fprintf(file, "Icon=%s\n", icon); - if (wmclass && lstrlenA(wmclass)) + if (wmclass && *wmclass) fprintf(file, "StartupWMClass=%s\n", wmclass); fclose(file);

1 0

Francois Gouget : winebus.sys: Avoid an unneeded strlen() call.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: a0536cab0326da35713e43859fc9631bf6fc8122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0536cab0326da35713e4385… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:51:32 2018 +0200 winebus.sys: Avoid an unneeded strlen() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dabda6a..64b245e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1084,7 +1084,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, else if (strcmp(key, "HID_UNIQ") == 0) { /* The caller has to free the serial number */ - if (strlen(value)) + if (*value) { *serial_number = (WCHAR*)strdupAtoW(value); found_serial = 1;

1 0

Francois Gouget : crypt32/tests: Avoid an unneeded strlen() call.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 4f36c83fa3973ee2c4ee88cfc175ae66b98b810f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f36c83fa3973ee2c4ee88cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:46:14 2018 +0200 crypt32/tests: Avoid an unneeded strlen() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 2da2a87..cea9481 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1017,7 +1017,7 @@ static void compareNameValues(const CERT_NAME_VALUE *expected, static void compareRDNAttrs(const CERT_RDN_ATTR *expected, const CERT_RDN_ATTR *got) { - if (expected->pszObjId && strlen(expected->pszObjId)) + if (expected->pszObjId && *expected->pszObjId) { ok(got->pszObjId != NULL, "Expected OID %s, got NULL\n", expected->pszObjId);

1 0

Francois Gouget : crypt32/tests: Fix a typo and reword a comment.
by Alexandre Julliard 23 Oct '18

23 Oct '18

Module: wine Branch: master Commit: 425cdb6b72ac818fe3fe1b731d02ed26d6c84d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=425cdb6b72ac818fe3fe1b73… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:43:31 2018 +0200 crypt32/tests: Fix a typo and reword a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/oid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 5247a4a..ae03bba 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -652,8 +652,8 @@ static void test_registerOIDInfo(void) ok(!info2, "should fail\n"); SetLastError(0xdeadbeef); - /* while succeeds next call does't write anything to registry under Windows - * because of dwGroupId == 0. + /* While it succeeds, the next call does not write anything to the + * registry on Windows because dwGroupId == 0. */ ret = CryptRegisterOIDInfo(&info1, 0); ok(ret, "got %u\n", GetLastError());

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018