- Revert 35039 on hpoussin's request.

svn path=/trunk/; revision=35064
This commit is contained in:
Aleksey Bragin 2008-08-03 11:14:34 +00:00
parent 199ec77874
commit 6fbda662d9
2 changed files with 2 additions and 19 deletions

View file

@ -3299,9 +3299,8 @@ int write_expr_eval_routines(FILE *file, const char *iface)
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);

View file

@ -46,22 +46,6 @@ Index: server.c
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)