ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2019-12-09 09:41:53 +01:00 committed by Alexandre Julliard
parent 3b91403e41
commit 6ccd78e35f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/user32/tests/monitor.c
View File

@ -71,7 +71,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de
int device_id; int device_id;
int subsys_id; int subsys_id;
int revision_id; int revision_id;
size_t length;
HDC hdc; HDC hdc;
adapter_count++; 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); "#%d: wrong DeviceKey %s\n", index, device->DeviceKey);
/* DeviceString */ /* DeviceString */
length = strlen(device->DeviceString); 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 */
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 */ *device->DeviceString, "#%d: expect DeviceString not empty\n", index);
length > 0, "#%d: expect DeviceString not empty\n", index);
/* StateFlags */ /* StateFlags */
if (index == 0) 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); ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName);
/* DeviceString */ /* 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 */ /* StateFlags */
if (adapter_index == 0 && monitor_index == 0) if (adapter_index == 0 && monitor_index == 0)