[WINETESTS/RPCRT4]

Until now, rpcrt4 winetests where badly broken : client calls remotely forwarded to serverside functions which called... client side functions. One has to wonder how testbot survived the operation
- Cmake : fix that
- rbuild : add a hack keeping the old behaviour, because I don't know how to make this right

svn path=/trunk/; revision=53503
This commit is contained in:
Jérôme Gardou 2011-08-30 20:49:31 +00:00
parent 597370501d
commit 0248645f79
3 changed files with 11 additions and 2 deletions

View file

@ -5,9 +5,16 @@ add_definitions(-D_WIN32_WINNT=0x500)
add_definitions(
-D__ROS_LONG64__
-D_DLL -D__USE_CRTIMP)
if(MSVC)
set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_)
else()
set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_)
endif()
add_rpc_files(client server.idl)
add_rpc_files(server server.idl)
unset(IDL_FLAGS)
list(APPEND SOURCE
cstub.c

View file

@ -12,6 +12,8 @@
<include root="intermediate" base="rpcrt4_winetest">.</include>
<define name="__ROS_LONG64__" />
<redefine name="_WIN32_WINNT">0x0500</redefine>
<!--Grotesque hack-->
<define name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</redefine>
<library>wine</library>
<library>pseh</library>
<library>ole32</library>

View file

@ -1542,12 +1542,12 @@ server(void)
if (pRpcServerRegisterIfEx)
{
trace("Using RpcServerRegisterIfEx\n");
status = pRpcServerRegisterIfEx(IServer_v0_0_s_ifspec, NULL, NULL,
status = pRpcServerRegisterIfEx(s_IServer_v0_0_s_ifspec, NULL, NULL,
RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH,
RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL);
}
else
status = RpcServerRegisterIf(IServer_v0_0_s_ifspec, NULL, NULL);
status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL);
ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status);
status = RpcServerListen(1, 20, TRUE);
ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status);