Robert Shearman : rpcrt4: Implement more conformance operations and more types.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 63aaf8dbd7fc1ebcd2acb112066062b1ceddd9a9
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=63aaf8dbd7fc1ebcd2acb112...

Author: Robert Shearman 
Date:   Mon May 15 16:56:45 2006 +0100

rpcrt4: Implement more conformance operations and more types.

---

dlls/rpcrt4/ndr_marshall.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index aaba7cc..a0da609 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -459,9 +459,11 @@ PFORMAT_STRING ComputeConformanceOrVaria
   case RPC_FC_USHORT:
     data = *(USHORT*)ptr;
     break;
+  case RPC_FC_CHAR:
   case RPC_FC_SMALL:
     data = *(CHAR*)ptr;
     break;
+  case RPC_FC_BYTE:
   case RPC_FC_USMALL:
     data = *(UCHAR*)ptr;
     break;
@@ -479,6 +481,18 @@ done_conf_grab:
   case RPC_FC_DEREFERENCE:
     /* already handled */
     break;
+  case RPC_FC_ADD_1:
+    *pCount = data + 1;
+    break;
+  case RPC_FC_SUB_1:
+    *pCount = data - 1;
+    break;
+  case RPC_FC_MULT_2:
+    *pCount = data * 2;
+    break;
+  case RPC_FC_DIV_2:
+    *pCount = data / 2;
+    break;
   default:
     FIXME("unknown conformance op %d\n", pFormat[1]);
     goto finish_conf;