[ros-diffs] [fireball] 35064: - Revert 35039 on hpoussin's request.

[fireball at svn.reactos.org]

Author: fireball
Date: Sun Aug  3 06:14:34 2008
New Revision: 35064

URL: http://svn.reactos.org/svn/reactos?rev=35064&view=rev
Log:
- Revert 35039 on hpoussin's request.

Modified:
    trunk/reactos/tools/widl/typegen.c
    trunk/reactos/tools/widl/widl_ros.diff

Modified: trunk/reactos/tools/widl/typegen.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=35064&r1=35063&r2=35064&view=diff
==============================================================================
--- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sun Aug  3 06:14:34 2008
@@ -3299,9 +3299,8 @@
         print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n",
                    iface, name, callback_offset);
         print_file(file, 0, "{\n");
-        print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n",
-                    is_struct(eval->structure->type) ? "struct " : "", name, var_name,
-                    is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff);
+        print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n",
+                    name, var_name, name, eval->baseoff);
         print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */
         print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)");
         write_struct_expr(file, eval->expr, 1, fields, var_name);

Modified: trunk/reactos/tools/widl/widl_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?rev=35064&r1=35063&r2=35064&view=diff
==============================================================================
--- trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] Sun Aug  3 06:14:34 2008
@@ -46,22 +46,6 @@
      print_server("#include \"%s\"\n", header_name);
      fprintf(server, "\n");
  }
-Index: typegen.c
-===================================================================
---- typegen.c	(revision 32187)
-+++ typegen.c	(working copy)
-@@ -3299,8 +3299,9 @@
-         print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n",
-                    iface, name, callback_offset);
-         print_file(file, 0, "{\n");
--        print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n",
--                    name, var_name, name, eval->baseoff);
-+        print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n",
-+                    is_struct(eval->structure->type) ? "struct " : "", name, var_name,
-+                    is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff);
-         print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */
-         print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)");
-         write_struct_expr(file, eval->expr, 1, fields, var_name);
 Index: typelib.c
 ===================================================================
 --- typelib.c	(revision 32187)