December 2019 - Wine-commits

Hans Leidekker : wbemprox: Use a terminated string in parse_resource.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 76ee089aade14ddf833c4ef7c382c8d413664251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76ee089aade14ddf833c4ef7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 9 13:31:12 2019 +0100 wbemprox: Use a terminated string in parse_resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48245 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemlocator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 99d90c357f..18c37275ed 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -98,7 +98,7 @@ static BOOL is_local_machine( const WCHAR *server ) static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) { - static const WCHAR rootW[] = {'R','O','O','T'}; + static const WCHAR rootW[] = {'R','O','O','T',0}; static const WCHAR cimv2W[] = {'C','I','M','V','2',0}; static const WCHAR defaultW[] = {'D','E','F','A','U','L','T',0}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; @@ -131,7 +131,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) && wcsnicmp( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) - 1 && wcsnicmp( rootW, p, len )) goto done; if (!*q) { hr = S_OK;

1 0

Austin English : httpapi: Return ERROR_SUCCESS for unimplemented flags in HttpInitialize.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 280bfb58b5162be6d8cee8827307721d7624ac0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=280bfb58b5162be6d8cee882… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Dec 8 23:11:27 2019 -0600 httpapi: Return ERROR_SUCCESS for unimplemented flags in HttpInitialize. Returning ERROR_CALL_NOT_IMPLEMENTED breaks .Net installers. MSDN suggests that ERROR_INVALID_PARAMETER may be more appropriate, but that too breaks .Net. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 0449d53045..8adbd38be5 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -62,7 +62,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (flags & ~HTTP_INITIALIZE_SERVER) { FIXME("Unhandled flags %#x.\n", flags); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT)))

1 0

Louis Lenders : odbcbcp: Add new stub dll.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 11d902429a9fc4b31c1f5891e30151714327b383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d902429a9fc4b31c1f5891… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Dec 6 19:17:11 2019 +0100 odbcbcp: Add new stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48234 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/odbcbcp/Makefile.in | 6 ++++++ dlls/odbcbcp/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/odbcbcp/odbcbcp.spec | 28 ++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+) diff --git a/configure b/configure index 6310283580..a5c504b70b 100755 --- a/configure +++ b/configure @@ -1494,6 +1494,7 @@ enable_ntoskrnl_exe enable_ntprint enable_objsel enable_odbc32 +enable_odbcbcp enable_odbccp32 enable_odbccu32 enable_ole32 @@ -20713,6 +20714,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint wine_fn_config_makefile dlls/ntprint/tests enable_tests wine_fn_config_makefile dlls/objsel enable_objsel wine_fn_config_makefile dlls/odbc32 enable_odbc32 +wine_fn_config_makefile dlls/odbcbcp enable_odbcbcp wine_fn_config_makefile dlls/odbccp32 enable_odbccp32 wine_fn_config_makefile dlls/odbccp32/tests enable_tests wine_fn_config_makefile dlls/odbccu32 enable_odbccu32 diff --git a/configure.ac b/configure.ac index 97d2dbf3e5..13f971866b 100644 --- a/configure.ac +++ b/configure.ac @@ -3545,6 +3545,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) +WINE_CONFIG_MAKEFILE(dlls/odbcbcp) WINE_CONFIG_MAKEFILE(dlls/odbccp32) WINE_CONFIG_MAKEFILE(dlls/odbccp32/tests) WINE_CONFIG_MAKEFILE(dlls/odbccu32) diff --git a/dlls/odbcbcp/Makefile.in b/dlls/odbcbcp/Makefile.in new file mode 100644 index 0000000000..c0269cb5a9 --- /dev/null +++ b/dlls/odbcbcp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = odbcbcp.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/odbcbcp/main.c b/dlls/odbcbcp/main.c new file mode 100644 index 0000000000..2dfe6d0bab --- /dev/null +++ b/dlls/odbcbcp/main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2019 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(odbcbcp); + +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(dll); + break; + } + return TRUE; +} diff --git a/dlls/odbcbcp/odbcbcp.spec b/dlls/odbcbcp/odbcbcp.spec new file mode 100644 index 0000000000..38488952f5 --- /dev/null +++ b/dlls/odbcbcp/odbcbcp.spec @@ -0,0 +1,28 @@ +@ stub bcp_batch +@ stub bcp_bind +@ stub bcp_colfmt +@ stub bcp_collen +@ stub bcp_colptr +@ stub bcp_columns +@ stub bcp_control +@ stub bcp_done +@ stub bcp_exec +@ stub bcp_getcolfmt +@ stub bcp_initA +@ stub bcp_initW +@ stub bcp_moretext +@ stub bcp_readfmtA +@ stub bcp_readfmtW +@ stub bcp_sendrow +@ stub bcp_setcolfmt +@ stub bcp_writefmtA +@ stub bcp_writefmtW +@ stub dbprtypeA +@ stub dbprtypeW +@ stub LibMain +@ stub SQLCloseEnumServers +@ stub SQLGetNextEnumeration +@ stub SQLInitEnumServers +@ stub SQLLinkedCatalogsA +@ stub SQLLinkedCatalogsW +@ stub SQLLinkedServers

1 0

Alexandre Julliard : configure: Get rid of the gcc strength-reduce bug check.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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 : user32/tests: Avoid an unneeded (&commented out) strlen() call.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: e248170e30d9103e3ff162efc5eb91a8723b18ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e248170e30d9103e3ff162ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:40:06 2019 +0100 user32/tests: Avoid an unneeded (&commented out) 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/user32/tests/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 8d8115131e..9f6f45990f 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1710,7 +1710,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 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

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: 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 : 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 : 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