Re: [ros-dev] [ros-diffs] [jgardou] 53503: [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...

[Aleksey Bragin]

This breaks RBUILD-based build.
More precisely these lines:
+        <!--Grotesque hack-->
+        <define 
name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</redefine>

it seems to be already defined by something.

WBR,
Aleksey Bragin.

-----Original Message----- 
From: jgardou(a)svn.reactos.org
Sent: Wednesday, August 31, 2011 12:49 AM
To: ros-diffs(a)reactos.org
Subject: [ros-diffs] [jgardou] 53503: [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...

Author: jgardou
Date: Tue Aug 30 20:49:31 2011
New Revision: 53503

URL: http://svn.reactos.org/svn/reactos?rev=53503&view=rev
Log:
[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

Modified:
    trunk/rostests/winetests/rpcrt4/CMakeLists.txt
    trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild
    trunk/rostests/winetests/rpcrt4/server.c

Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Tue Aug 30 
20:49:31 2011
@@ -5,9 +5,16 @@
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

Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r…
==============================================================================
--- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Tue Aug 30 
20:49:31 2011
@@ -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>

Modified: trunk/rostests/winetests/rpcrt4/server.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c…
==============================================================================
--- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Tue Aug 30 
20:49:31 2011
@@ -1542,12 +1542,12 @@
   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);