r6018: Add idl and server side for Test_Surrounding

(This used to be commit ed11601aef11df35f30b10e422e7113976dc6f26)

diff --git a/testprogs/win32/rpcecho/Makefile b/testprogs/win32/rpcecho/Makefile
index 253ebedb715d81beda2478dc3f3497c90c7e0156..ca0c823eab8181e62f82be0902d3a815862b6d0b 100644 (file)
--- a/testprogs/win32/rpcecho/Makefile
+++ b/testprogs/win32/rpcecho/Makefile
@@ -1,6 +1,5 @@
-CC=E:\VC98\bin\cl -nologo

 INCLUDES=-I 
 INCLUDES=-I 

-CFLAGS=$(INCLUDES) -Zi
+CFLAGS=$(INCLUDES) -Zi -nologo

 LIBS=rpcrt4.lib
 
 all: client server
 LIBS=rpcrt4.lib
 
 all: client server


@@ -12,10 +11,10 @@ rpcecho.h rpcecho_s.c rpcecho_c.c: rpcecho.idl rpcecho.acf
        midl rpcecho.idl
 
 client: client.obj rpcecho_c.obj utils.obj
        midl rpcecho.idl
 
 client: client.obj rpcecho_c.obj utils.obj

-       $(CC) -o client client.obj rpcecho_c.obj utils.obj $(LIBS)
+       $(CC) $(CFLAGS) -o client client.obj rpcecho_c.obj utils.obj $(LIBS)

 
 server: server.obj rpcecho_s.obj utils.obj
 
 server: server.obj rpcecho_s.obj utils.obj

-       $(CC) -o server server.obj rpcecho_s.obj utils.obj $(LIBS)
+       $(CC) $(CFLAGS) -o server server.obj rpcecho_s.obj utils.obj $(LIBS)

 
 client.obj: rpcecho.h client.c
 server.obj: rpcecho.h server.c
 
 client.obj: rpcecho.h client.c
 server.obj: rpcecho.h server.c

diff --git a/testprogs/win32/rpcecho/rpcecho.idl b/testprogs/win32/rpcecho/rpcecho.idl
index deb07e2528615d9d777c707139c620adacecbf03..a0d9dbc4c6ca47fc4400ccf6d79d78aa5869133f 100644 (file)
--- a/testprogs/win32/rpcecho/rpcecho.idl
+++ b/testprogs/win32/rpcecho/rpcecho.idl
@@ -138,4 +138,12 @@ interface rpcecho
                [in,out,ref,switch_is(*foo1)] echo_Enum3 *foo3
                );
 
                [in,out,ref,switch_is(*foo1)] echo_Enum3 *foo3
                );
 

+       typedef struct {
+               uint32 x;
+               [size_is(x)] uint16 surrounding[*];
+       } echo_Surrounding;
+
+       void echo_TestSurrounding(
+               [in,out,ref] echo_Surrounding *data
+       );

 }
 }

diff --git a/testprogs/win32/rpcecho/server.c b/testprogs/win32/rpcecho/server.c
index 112eb24206adecca9251d1ca0fefea9fe8408672..888199db3d2604a3319d56e2598460164dbf7b10 100644 (file)
--- a/testprogs/win32/rpcecho/server.c
+++ b/testprogs/win32/rpcecho/server.c
@@ -133,6 +133,12 @@ void echo_TestEnum(echo_Enum1 *foo1,
        foo2->e1 = ECHO_ENUM2;
 }
 
        foo2->e1 = ECHO_ENUM2;
 }
 

+void echo_TestSurrounding(echo_Surrounding *data)
+{
+       printf("Incoming array of size %d\n", data->x);
+       data->x *= 2;
+}
+

 void main(int argc, char **argv)
 {
        RPC_STATUS status;
 void main(int argc, char **argv)
 {
        RPC_STATUS status;