marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcrt4/tests: Use common wine_dbgstr_guid implementation from test.h.

oldstable
Frédéric Delanoy 2014-01-25 15:24:44 +01:00 committed by Alexandre Julliard
parent 2769763c64
commit b553f54323
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/rpcrt4/tests/rpc.c
View File

@ -730,15 +730,6 @@ static void test_RpcStringBindingFromBinding(void)
ok(status == RPC_S_OK, "RpcBindingFree failed with error %u\n", status); ok(status == RPC_S_OK, "RpcBindingFree failed with error %u\n", status);
} }
static char *printGuid(char *buf, int size, const UUID *guid)
{
snprintf(buf, size, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1],
guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5],
guid->Data4[6], guid->Data4[7]);
return buf;
}
static void test_UuidCreate(void) static void test_UuidCreate(void)
{ {
UUID guid; UUID guid;
@ -756,7 +747,6 @@ static void test_UuidCreate(void)
UUID and, or; UUID and, or;
RPC_STATUS rslt; RPC_STATUS rslt;
int i; int i;
char buf[39];
and = guid; and = guid;
or = guid; or = guid;
@ -780,9 +770,9 @@ static void test_UuidCreate(void)
*dst |= *src; *dst |= *src;
} }
ok(UuidEqual(&and, &v4and, &rslt), ok(UuidEqual(&and, &v4and, &rslt),
"unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &and)); "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&and));
ok(UuidEqual(&or, &v4or, &rslt), ok(UuidEqual(&or, &v4or, &rslt),
"unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &or)); "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&or));
} }
else else
{ {
@ -816,7 +806,6 @@ static void test_UuidCreateSequential(void)
if (version == 1) if (version == 1)
{ {
UUID guid2; UUID guid2;
char buf[39];
if (!ret) if (!ret)
{ {
@ -825,7 +814,7 @@ static void test_UuidCreateSequential(void)
*/ */
ok(!(guid1.Data4[2] & 0x01), ok(!(guid1.Data4[2] & 0x01),
"GUID does not appear to contain a MAC address: %s\n", "GUID does not appear to contain a MAC address: %s\n",
printGuid(buf, sizeof(buf), &guid1)); wine_dbgstr_guid(&guid1));
} }
else else
{ {
@ -834,7 +823,7 @@ static void test_UuidCreateSequential(void)
*/ */
ok((guid1.Data4[2] & 0x01), ok((guid1.Data4[2] & 0x01),
"GUID does not appear to contain a multicast MAC address: %s\n", "GUID does not appear to contain a multicast MAC address: %s\n",
printGuid(buf, sizeof(buf), &guid1)); wine_dbgstr_guid(&guid1));
} }
/* Generate another GUID, and make sure its MAC address matches the /* Generate another GUID, and make sure its MAC address matches the
* first. * first.
@ -846,7 +835,7 @@ static void test_UuidCreateSequential(void)
ok(version == 1, "unexpected version %d\n", version); ok(version == 1, "unexpected version %d\n", version);
ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)),
"unexpected value in MAC address: %s\n", "unexpected value in MAC address: %s\n",
printGuid(buf, sizeof(buf), &guid2)); wine_dbgstr_guid(&guid2));
} }
} }