December 2019 - Wine-Devel - list.winehq.org

[PATCH] winedbg: Avoid unneeded strlen() calls.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Note that target_xml is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b7f59ee05be..85ebc882a62 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1615,7 +1615,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { - if (strlen(target_xml)) + if (*target_xml) return packet_reply(gdbctx, "PacketSize=400;qXfer:features:read+"); else { @@ -1652,7 +1652,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) } break; case 'X': - if (strlen(target_xml) && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) + if (*target_xml && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) return packet_reply(gdbctx, target_xml); break; } -- 2.20.1

1 0

[PATCH] user32/tests: Fix the spelling of an ok() message.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 6bebfe95f4b..aaa51d560ac 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -591,7 +591,7 @@ static void test_inputdesktop(void) /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); - ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); + ok(old_thread_desk != NULL, "GetThreadDesktop failed!\n"); memset(name, 0, sizeof(name)); ret = GetUserObjectInformationA(old_thread_desk, UOI_NAME, name, 1024, NULL); ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); -- 2.20.1

1 0

[PATCH] oleaut32: Fix the spelling of a FIXME() message.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 eb713a4e2f8..11e83789483 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; -- 2.20.1

1 0

[PATCH] kernel32/tests: Trace LastError when GetPhysicallyInstalledSystemMemory() fails.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 38fae0eede2..5ea7a25c46c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1206,7 +1206,7 @@ static void test_GetPhysicallyInstalledSystemMemory(void) total_memory = 0; ret = pGetPhysicallyInstalledSystemMemory(&total_memory); - ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed\n"); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%u)\n", GetLastError()); ok(total_memory != 0, "expected total_memory != 0\n"); memstatus.dwLength = sizeof(memstatus); -- 2.20.1

1 0

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

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 2d19404a763..ef087893016 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)); } -- 2.20.1

1 0

[PATCH] wmvcore: Fix the spelling of WMReaderAdvanced6_SetProtectStreamSamples().
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 68e35cfd484..50bf9d80079 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) -- 2.20.1

1 0

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

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 effb3e526b4..43c4d9efef3 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 3e99a0d2038..b0769bd839d 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 & */ -- 2.20.1

1 0

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

Dec. 9, 2019

Note that text is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 e7ceeffd4cd..d0fff562499 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 */ -- 2.20.1

1 0

[PATCH] user32: Fix the spelling of a TRACE() message.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index aad5274973f..f759bd10f94 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1397,7 +1397,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (flags & PLACE_MAX) make_point_onscreen( &wp.ptMaxPosition ); if (flags & PLACE_RECT) make_rect_onscreen( &wp.rcNormalPosition ); - TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x ajusted to min %d,%d max %d,%d normal %s\n", + TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x adjusted to min %d,%d max %d,%d normal %s\n", hwnd, wndpl->ptMinPosition.x, wndpl->ptMinPosition.y, wndpl->ptMaxPosition.x, wndpl->ptMaxPosition.y, wine_dbgstr_rect(&wndpl->rcNormalPosition), flags, -- 2.20.1

1 0

[PATCH] comctl32/tests: Avoid an unneeded strlen() call.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Note that pathBuffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 dc3b247fb62..a3769423ee6 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); -- 2.20.1

1 0