widl: Structures and arrays with pointers should be complex when generating code…

widl: Structures and arrays with pointers should be complex when generating code for 64-bit platforms. The non-complex variants depend on the wire size of the structure/array matching the buffer size, but this no longer applies when pointers are 8 bytes instead of 4.

widl: Structures and arrays with pointers should be complex when generating code…
2e0aefc1 · Rob Shearman · Alexandre Julliard · 07e8ab45 · 2e0aefc1
Commit 2e0aefc1 authored Dec 27, 2008 by Rob Shearman Committed by Alexandre Julliard Dec 27, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

typegen.c tools/widl/typegen.c +14 -0

No files found.
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -212,14 +212,28 @@ static int get_struct_type(const type_t *type)
      break;

    case RPC_FC_RP:
+      return RPC_FC_BOGUS_STRUCT;
+
    case RPC_FC_UP:
    case RPC_FC_FP:
    case RPC_FC_OP:
+      if (pointer_size != 4)
+        return RPC_FC_BOGUS_STRUCT;
+      has_pointer = 1;
+      break;
+
    case RPC_FC_CARRAY:
    case RPC_FC_CVARRAY:
    case RPC_FC_BOGUS_ARRAY:
+    {
+      unsigned int ptr_type = get_attrv(field->attrs, ATTR_POINTERTYPE);
+      if (!ptr_type || ptr_type == RPC_FC_RP)
+        return RPC_FC_BOGUS_STRUCT;
+      else if (pointer_size != 4)
+        return RPC_FC_BOGUS_STRUCT;
      has_pointer = 1;
      break;
+    }

    /*
     * Propagate member attributes