[PATCH v2 2/2] rpcrt4/tests: Add a bare test for NdrServerCallAll().
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/tests/rpc.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d3a3aee..492f84b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -568,6 +568,29 @@ static void test_I_RpcMapWin32Status(void) } } +static void test_NdrServerCallAll(void) +{ + void *pNdrServerCallAll = + (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), + "NdrServerCallAll"); + + if (!pNdrServerCallAll) + { +#ifdef _WIN64 + ok(FALSE, "NdrServerCallAll not exported\n"); +#else + ok(TRUE, ""); +#endif + return; + } + +#ifndef _WIN64 + ok(FALSE, "NdrServerCallAll is exported\n"); +#else + ok(TRUE, ""); +#endif +} + static void test_RpcStringBindingParseA(void) { static unsigned char valid_binding[] = "00000000-0000-0000-c000-000000000046(a)ncacn_np:.[endpoint=\\pipe\\test]"; @@ -1197,6 +1220,7 @@ START_TEST( rpc ) TestDceErrorInqText(); test_towers(); test_I_RpcMapWin32Status(); + test_NdrServerCallAll(); test_RpcStringBindingParseA(); test_RpcExceptionFilter("I_RpcExceptionFilter"); test_RpcExceptionFilter("RpcExceptionFilter"); -- 2.10.0.windows.1
On 4/26/20 9:45 PM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/tests/rpc.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d3a3aee..492f84b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -568,6 +568,29 @@ static void test_I_RpcMapWin32Status(void) } }
+static void test_NdrServerCallAll(void) +{ + void *pNdrServerCallAll = + (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), + "NdrServerCallAll"); + + if (!pNdrServerCallAll) + { +#ifdef _WIN64 + ok(FALSE, "NdrServerCallAll not exported\n"); +#else + ok(TRUE, ""); +#endif + return; + } + +#ifndef _WIN64 + ok(FALSE, "NdrServerCallAll is exported\n"); +#else + ok(TRUE, ""); +#endif +} +
I don't know whether this test is worth having in general—we don't usually bother with it—but if it is, something like this seems simpler: #ifdef _WIN64 ok(!!pNdrServerCallAll) #else ok(!pNdrServerCallAll) #endif
static void test_RpcStringBindingParseA(void) { static unsigned char valid_binding[] = "00000000-0000-0000-c000-000000000046(a)ncacn_np:.[endpoint=\\pipe\\test]"; @@ -1197,6 +1220,7 @@ START_TEST( rpc ) TestDceErrorInqText(); test_towers(); test_I_RpcMapWin32Status(); + test_NdrServerCallAll(); test_RpcStringBindingParseA(); test_RpcExceptionFilter("I_RpcExceptionFilter"); test_RpcExceptionFilter("RpcExceptionFilter");
On 27/04/2020 04:48, Zebediah Figura wrote:
I don't know whether this test is worth having in general—we don't usually bother with it—but if it is, something like this seems simpler:
This is kind of a special case (see my initial answer), so I would say the test is worth it.
#ifdef _WIN64 ok(!!pNdrServerCallAll) #else ok(!pNdrServerCallAll) #endif
Right, I'll do that... --
participants (2)
-
Serge Gautherie -
Zebediah Figura