wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Francois Gouget : winhttp/tests: Fix the spelling of ok() and skip() messages and a comment.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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 : kernel32/tests: Trace LastError when GetPhysicallyInstalledSystemMemory() fails.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 7eb54616ff7e0fe22dd45c18c29be2e0c279fe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb54616ff7e0fe22dd45c18… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:46:36 2019 +0100 kernel32/tests: Trace LastError when GetPhysicallyInstalledSystemMemory() fails. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 38fae0eede..3c697f3195 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);

1 0

Francois Gouget : shlwapi/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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 : wmvcore: Fix the spelling of WMReaderAdvanced6_SetProtectStreamSamples().
by Alexandre Julliard 09 Dec '19

09 Dec '19

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: Fix the spelling of a WINE_TRACE() message and a comment.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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 09 Dec '19

09 Dec '19

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 09 Dec '19

09 Dec '19

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: Fix the spelling of a TRACE() message.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: ba1aa243783eb9b798d1cf9c47741c4f363bba0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1aa243783eb9b798d1cf9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:42:47 2019 +0100 user32: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 aad5274973..f759bd10f9 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,

1 0

Francois Gouget : user32/tests: Avoid a couple of unneeded strlen() calls.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 6ccd78e35f1452276155f26e7f3756a8e08007d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccd78e35f1452276155f26e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:41:53 2019 +0100 user32/tests: Avoid a couple of unneeded strlen() calls. Note that DeviceString is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 567870e3d1..47e01b1a6a 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -71,7 +71,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de int device_id; int subsys_id; int revision_id; - size_t length; HDC hdc; adapter_count++; @@ -87,9 +86,8 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); /* DeviceString */ - length = strlen(device->DeviceString); - ok(broken(length == 0) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ - length > 0, "#%d: expect DeviceString not empty\n", index); + ok(broken(!*device->DeviceString) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ + *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ if (index == 0) @@ -139,7 +137,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ - ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); + ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0)

1 0

Francois Gouget : user32/tests: Avoid an unneeded lstrlenA() call.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

← Newer
1
...
37
38
39
40
41
42
43
...
64
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 December 2019