October 2018 - Wine-Commits

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

Oct. 23, 2018

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

Michael Stefaniuc : dmsynth: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: eb2e0d9fbe093f4783b91b9ffe1941a8301bcda8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2e0d9fbe093f4783b91b9f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:33 2018 +0200 dmsynth: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 1fb5157..9568cb6 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -360,7 +360,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; }

1 0

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

Oct. 23, 2018

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

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

Oct. 23, 2018

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 Oct. 23, 2018

Oct. 23, 2018

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

Michael Stefaniuc : dmusic: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 0eb58d6cfcccaa2222a7ccfb52ae859a8e576f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb58d6cfcccaa2222a7ccfb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 23 19:42:34 2018 +0200 dmusic: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 58dcd9d..033983f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -301,7 +301,7 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPG return S_OK; } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE(buff)); CLSIDFromString(buff, &defaultPortGUID); *guid_port = defaultPortGUID; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index ad172ab..9eb5364 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -408,7 +408,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; } @@ -452,7 +452,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 */ @@ -484,7 +484,7 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask) FE(DMUS_PORTPARAMS_EFFECTS), FE(DMUS_PORTPARAMS_SHARE) }; - return debugstr_flags(flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* Dump whole DMUS_PORTPARAMS struct */

1 0

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

Oct. 23, 2018

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

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

Oct. 23, 2018

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

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

Oct. 23, 2018

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

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

Oct. 23, 2018

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