Module: wine Branch: master Commit: 328acc81fcbfce0a354555d214bb5b47d7686fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=328acc81fcbfce0a354555d214...
Author: André Hentschel nerv@dawncrow.de Date: Mon Aug 29 21:10:12 2011 +0200
rpcrt4/tests: Fix NULL string handling in an ok() check.
---
dlls/rpcrt4/tests/rpc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index bdc1579..d914c97 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -594,8 +594,10 @@ static void test_RpcStringBindingParseA(void) ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); - todo_wine - ok(options && !strcmp((char *)options, ""), "options should have been "" of "%s"\n", options); + if (options) + ok(!strcmp((char *)options, ""), "options should have been "" of "%s"\n", options); + else + todo_wine ok(FALSE, "options is NULL\n"); RpcStringFreeA(&uuid); RpcStringFreeA(&protseq); RpcStringFreeA(&network_addr); @@ -609,8 +611,10 @@ static void test_RpcStringBindingParseA(void) ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); - todo_wine - ok(options && !strcmp((char *)options, ""), "options should have been "" of "%s"\n", options); + if (options) + ok(!strcmp((char *)options, ""), "options should have been "" of "%s"\n", options); + else + todo_wine ok(FALSE, "options is NULL\n"); RpcStringFreeA(&uuid); RpcStringFreeA(&protseq); RpcStringFreeA(&network_addr);