December 2019 - Wine-Commits

Francois Gouget : winhttp/tests: Fix the spelling of ok() and skip() messages and a comment.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: c1273cff0ca999e19fc80f14dcfa38d0cbeec7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1273cff0ca999e19fc80f14… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:46:50 2019 +0100 winhttp/tests: Fix the spelling of ok() and skip() messages and a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a8d496238..e4c614cb10 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -412,7 +412,7 @@ static void test_WinHttpSendRequest (void) ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); /* writing more data than promised by the content-length header causes an error when the connection - is resued, so disable keep-alive */ + is reused, so disable keep-alive */ disable = WINHTTP_DISABLE_KEEP_ALIVE; ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); @@ -692,7 +692,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, got %u\n", GetLastError()); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); @@ -2144,7 +2144,7 @@ static void test_resolve_timeout(void) WinHttpCloseHandle(ses); } else - skip("Skipping host resolution tests, host resolution preformed by proxy\n"); + skip("Skipping host resolution tests, host resolution performed by proxy\n"); ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError());

1 0

Francois Gouget : shlwapi/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 308447324fd4660f50e87e9d4aa14a78f971a473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308447324fd4660f50e87e9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:45:11 2019 +0100 shlwapi/tests: Fix the spelling of a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 2d19404a76..ef08789301 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -449,7 +449,7 @@ START_TEST(progman_dde) /* Cleanup & Exit */ ret = DdeDisconnect(hConv); - ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(ret, "DdeDisconnect() failed: %u\n", DdeGetLastError(instance)); ret = DdeUninitialize(instance); ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); @@ -472,7 +472,7 @@ START_TEST(progman_dde) /* Cleanup & Exit */ ret = DdeDisconnect(hConv); - ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(ret, "DdeDisconnect() failed: %u\n", DdeGetLastError(instance)); ret = DdeUninitialize(instance); ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); }

1 0

Francois Gouget : cmd: Fix the spelling of a WINE_TRACE() message and a comment.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: ecdc4daccfe2e4b52b3a2dd9cb89e25d2bfbaa6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecdc4daccfe2e4b52b3a2dd9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:43:23 2019 +0100 cmd: Fix the spelling of a WINE_TRACE() message and a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c6048eb5c1..ee45acaf7c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2511,7 +2511,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { heap_free(dirsToWalk->dirName); heap_free(dirsToWalk); dirsToWalk = nextDir; - if (dirsToWalk) WINE_TRACE("Moving to next directorty to iterate: %s\n", + if (dirsToWalk) WINE_TRACE("Moving to next directory to iterate: %s\n", wine_dbgstr_w(dirsToWalk->dirName)); else WINE_TRACE("Finished all directories.\n"); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3e99a0d203..b0769bd839 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -34,7 +34,7 @@ /* msdn specified max for Win XP */ #define MAXSTRING 8192 -/* Data structure to hold commands delimitors/separators */ +/* Data structure to hold commands delimiters/separators */ typedef enum _CMDdelimiters { CMD_NONE, /* End of line or single & */

1 0

Francois Gouget : comctl32/tests: Avoid a couple of unneeded lstrlenA() calls.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: e3d7f4d619f849002c7e9e185fb1343a63f08017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d7f4d619f849002c7e9e18… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:43:01 2019 +0100 comctl32/tests: Avoid a couple of unneeded lstrlenA() calls. Note that text is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/updown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index e7ceeffd4c..d0fff56249 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -791,7 +791,7 @@ static void test_updown_create(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); GetWindowTextA(g_edit, text, MAX_PATH); - ok(lstrlenA(text) == 0, "Expected empty string\n"); + ok(!*text, "Expected empty string\n"); ok_sequence(sequences, EDIT_SEQ_INDEX, get_edit_text_seq, "get edit text", FALSE); DestroyWindow(updown); @@ -865,7 +865,7 @@ static void test_UDS_SETBUDDYINT(void) ok(style & UDS_SETBUDDYINT, "Expected UDS_SETBUDDY to be set\n"); SendMessageA(updown, UDM_SETPOS, 0, 20); GetWindowTextA(g_edit, text, ARRAY_SIZE(text)); - ok(lstrlenA(text) == 0, "Expected empty string\n"); + ok(!*text, "Expected empty string\n"); DestroyWindow(updown); /* creating with UDS_SETBUDDYINT */

1 0

Francois Gouget : comctl32/tests: Avoid an unneeded strlen() call.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 7be6046e756d379137b64eced0d066cc25979834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7be6046e756d379137b64ece… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:42:25 2019 +0100 comctl32/tests: Avoid an unneeded strlen() call. Note that pathBuffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index dc3b247fb6..a3769423ee 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1819,7 +1819,7 @@ static void test_listbox_dlgdir(void) ok (res == 0, "DlgDirSelectEx() with no selection returned %d, expected 0\n", res); /* WinXP-SP2 leaves pathBuffer untouched, but Win98 fills it with garbage. */ /* - ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); + ok (!*pathBuffer, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); */ /* Test proper drive/dir/file recognition */ itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0);

1 0

Francois Gouget : user32/tests: Avoid an unneeded lstrlenA() call.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 3b91403e411f4ad81f46e14d0aeb41f2dcf7686b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b91403e411f4ad81f46e14d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:41:10 2019 +0100 user32/tests: Avoid an unneeded lstrlenA() call. Note that ptr may be NULL (see ok() check a few lines up). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eed2ac437e..d370df181a 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1977,7 +1977,7 @@ static void test_DdeCreateDataHandle(void) ok(size == 262, "Expected 262, got %d\n", size); todo_wine { - ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); + ok(ptr && !*ptr, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); } ret = DdeUnaccessData(hdata);

1 0

Alexandre Julliard : configure: Get rid of the gcc strength-reduce bug check.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 421639ec63c06e67dd07af67cfd3d4103577b53e URL: https://source.winehq.org/git/wine.git/?a=commit;h=421639ec63c06e67dd07af67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 11:10:18 2019 +0100 configure: Get rid of the gcc strength-reduce bug check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 42 ------------------------------------------ configure.ac | 16 ---------------- 2 files changed, 58 deletions(-) diff --git a/configure b/configure index 1b463aebc0..6310283580 100755 --- a/configure +++ b/configure @@ -16833,48 +16833,6 @@ if test "x${GCC}" = "xyes" then EXTRACFLAGS="-Wall -pipe" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc strength-reduce bug" >&5 -$as_echo_n "checking for gcc strength-reduce bug... " >&6; } -if ${ac_cv_c_gcc_strength_bug+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_c_gcc_strength_bug="no" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int L[4] = {0,1,2,3}; -int -main () -{ -static int Array[3]; - unsigned int B = 3; - int i; - for(i=0; i<B; i++) Array[i] = i - 3; - for(i=0; i<4 - 1; i++) L[i] = L[i + 1]; - L[i] = 4; - return (Array[1] != -2 || L[2] != 3) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_gcc_strength_bug="no" -else - ac_cv_c_gcc_strength_bug="yes" -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_gcc_strength_bug" >&5 -$as_echo "$ac_cv_c_gcc_strength_bug" >&6; } - if test "$ac_cv_c_gcc_strength_bug" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fcf-protection=none" >&5 $as_echo_n "checking whether the compiler supports -fcf-protection=none... " >&6; } if ${ac_cv_cflags__fcf_protection_none+:} false; then : diff --git a/configure.ac b/configure.ac index ed0c1de9db..97d2dbf3e5 100644 --- a/configure.ac +++ b/configure.ac @@ -2009,22 +2009,6 @@ if test "x${GCC}" = "xyes" then EXTRACFLAGS="-Wall -pipe" - dnl Check for strength-reduce bug - AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug, - AC_RUN_IFELSE([AC_LANG_PROGRAM([[int L[[4]] = {0,1,2,3};]], -[[static int Array[[3]]; - unsigned int B = 3; - int i; - for(i=0; i<B; i++) Array[[i]] = i - 3; - for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]]; - L[[i]] = 4; - return (Array[[1]] != -2 || L[[2]] != 3)]])], - [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="no"]) ) - if test "$ac_cv_c_gcc_strength_bug" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" - fi - dnl Check for some compiler flags WINE_TRY_CFLAGS([-fcf-protection=none]) WINE_TRY_CFLAGS([-fno-stack-protector])

1 0

Francois Gouget : oleaut32: Fix the spelling of a FIXME() message.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 1a46034c4643c9b4948bed94bb7450aea62e1f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a46034c4643c9b4948bed94… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:47:17 2019 +0100 oleaut32: Fix the spelling of a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6e8a18c9d7..668ad8d582 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3757,7 +3757,7 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ptr += 6; if((w = *(WORD*)ptr) != 0xffff) { - FIXME("LibBlk.res06 = %04x. Assumung string and skipping\n", w); + FIXME("LibBlk.res06 = %04x. Assuming string and skipping\n", w); ptr += w; } ptr += 2;

1 0

Francois Gouget : wmvcore: Fix the spelling of WMReaderAdvanced6_SetProtectStreamSamples().
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 727951242236f1765056b87b67bd6d8e4f6bcfc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=727951242236f1765056b87b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:44:56 2019 +0100 wmvcore: Fix the spelling of WMReaderAdvanced6_SetProtectStreamSamples(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 68e35cfd48..50bf9d8007 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -621,7 +621,7 @@ static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced6_SetProtextStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, +static HRESULT WINAPI WMReaderAdvanced6_SetProtectStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) { WMReader *This = impl_from_IWMReaderAdvanced6(iface); @@ -681,7 +681,7 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { WMReaderAdvanced4_CancelSaveFileAs, WMReaderAdvanced4_GetURL, WMReaderAdvanced5_SetPlayerHook, - WMReaderAdvanced6_SetProtextStreamSamples + WMReaderAdvanced6_SetProtectStreamSamples }; static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface)

1 0

Francois Gouget : cmd: Avoid unneeded strlenW() calls.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 040c435075aa58448fe439712e4ce3259ad1a1e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=040c435075aa58448fe43971… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:48:16 2019 +0100 cmd: Avoid unneeded strlenW() calls. Neither WCMD_give_help(), nor WCMD_setshow_default() are ever called with a NULL pointer (notice how WCMD_skip_leading_spaces() already assumes its argument is not NULL and does not return NULL). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ee45acaf7c..43c4d9efef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2549,7 +2549,7 @@ void WCMD_give_help (const WCHAR *args) size_t i; args = WCMD_skip_leading_spaces((WCHAR*) args); - if (lstrlenW(args) == 0) { + if (!*args) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { @@ -3460,7 +3460,8 @@ void WCMD_setshow_default (const WCHAR *args) { } GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); - if (lstrlenW(args) == 0) { + + if (!*args) { lstrcatW (cwd, newlineW); WCMD_output_asis (cwd); } @@ -3552,7 +3553,7 @@ void WCMD_setshow_date (void) { DWORD count; static const WCHAR parmT[] = {'/','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, ARRAY_SIZE(curdate))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (wcsstr (quals, parmT) == NULL) { @@ -4194,7 +4195,7 @@ void WCMD_setshow_env (WCHAR *s) { /* Output the prompt */ *p++ = '\0'; - if (lstrlenW(p) != 0) WCMD_output_asis(p); + if (*p) WCMD_output_asis(p); /* Read the reply */ WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); @@ -4268,7 +4269,7 @@ void WCMD_setshow_env (WCHAR *s) { } *p++ = '\0'; - if (lstrlenW(p) == 0) p = NULL; + if (!*p) p = NULL; WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), wine_dbgstr_w(p)); status = SetEnvironmentVariableW(s, p); @@ -4293,7 +4294,7 @@ void WCMD_setshow_path (const WCHAR *args) { static const WCHAR pathW[] = {'P','A','T','H','\0'}; static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; - if (lstrlenW(param1) == 0 && lstrlenW(param2) == 0) { + if (!*param1 && !*param2) { status = GetEnvironmentVariableW(pathW, string, ARRAY_SIZE(string)); if (status != 0) { WCMD_output_asis ( pathEqW); @@ -4322,13 +4323,13 @@ void WCMD_setshow_prompt (void) { WCHAR *s; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { SetEnvironmentVariableW(promptW, NULL); } else { s = param1; while ((*s == '=') || (*s == ' ') || (*s == '\t')) s++; - if (lstrlenW(s) == 0) { + if (!*s) { SetEnvironmentVariableW(promptW, NULL); } else SetEnvironmentVariableW(promptW, s); @@ -4349,7 +4350,7 @@ void WCMD_setshow_time (void) { SYSTEMTIME st; static const WCHAR parmT[] = {'/','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { GetLocalTime(&st); if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); @@ -4756,7 +4757,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) WCHAR string[MAX_PATH], label[MAX_PATH], curdir[MAX_PATH]; BOOL status; - if (lstrlenW(path) == 0) { + if (!*path) { status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (!status) { WCMD_print_error (); @@ -4794,7 +4795,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } - if (lstrlenW(path) != 0) { + if (*path) { if (!SetVolumeLabelW(curdir, string)) WCMD_print_error (); } else {

1 0