ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Duplicate the exception handling code between 32-bit and 64-bit.

This commit is contained in:
Alexandre Julliard 2010-10-22 19:44:00 +02:00
parent 575485c6e7
commit 4c41dd5fca
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/widl/client.c
View File

@ -448,8 +448,6 @@ static void init_client(void)
print_client( "#define DECLSPEC_HIDDEN\n"); print_client( "#define DECLSPEC_HIDDEN\n");
print_client( "#endif\n"); print_client( "#endif\n");
print_client( "\n"); print_client( "\n");
write_exceptions( client );
print_client( "\n");
} }
@ -503,6 +501,9 @@ static void write_client_routines(const statement_list_t *stmts)
unsigned int proc_offset = 0; unsigned int proc_offset = 0;
int expr_eval_routines; int expr_eval_routines;
write_exceptions( client );
print_client( "\n");
write_formatstringsdecl(client, indent, stmts, need_stub); write_formatstringsdecl(client, indent, stmts, need_stub);
expr_eval_routines = write_expr_eval_routines(client, client_token); expr_eval_routines = write_expr_eval_routines(client, client_token);
if (expr_eval_routines) if (expr_eval_routines)
@ -530,7 +531,7 @@ void write_client(const statement_list_t *stmts)
if (do_win32 && do_win64) if (do_win32 && do_win64)
{ {
fprintf(client, "\n#ifndef _WIN64\n\n"); fprintf(client, "#ifndef _WIN64\n\n");
pointer_size = 4; pointer_size = 4;
write_client_routines( stmts ); write_client_routines( stmts );
fprintf(client, "\n#else /* _WIN64 */\n\n"); fprintf(client, "\n#else /* _WIN64 */\n\n");

35
tools/widl/server.c
View File

@ -384,22 +384,6 @@ static void init_server(void)
print_server( "#define DECLSPEC_HIDDEN\n"); print_server( "#define DECLSPEC_HIDDEN\n");
print_server( "#endif\n"); print_server( "#endif\n");
print_server( "\n"); print_server( "\n");
write_exceptions( server );
print_server("\n");
print_server("struct __server_frame\n");
print_server("{\n");
print_server(" __DECL_EXCEPTION_FRAME\n");
print_server(" MIDL_STUB_MESSAGE _StubMsg;\n");
print_server("};\n");
print_server("\n");
print_server("static int __server_filter( struct __server_frame *__frame )\n");
print_server( "{\n");
print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n");
print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n");
print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n");
print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n");
print_server( "}\n");
print_server( "\n");
} }
@ -445,6 +429,23 @@ static void write_server_routines(const statement_list_t *stmts)
unsigned int proc_offset = 0; unsigned int proc_offset = 0;
int expr_eval_routines; int expr_eval_routines;
write_exceptions( server );
print_server("\n");
print_server("struct __server_frame\n");
print_server("{\n");
print_server(" __DECL_EXCEPTION_FRAME\n");
print_server(" MIDL_STUB_MESSAGE _StubMsg;\n");
print_server("};\n");
print_server("\n");
print_server("static int __server_filter( struct __server_frame *__frame )\n");
print_server( "{\n");
print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n");
print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n");
print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n");
print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n");
print_server( "}\n");
print_server( "\n");
write_formatstringsdecl(server, indent, stmts, need_stub); write_formatstringsdecl(server, indent, stmts, need_stub);
expr_eval_routines = write_expr_eval_routines(server, server_token); expr_eval_routines = write_expr_eval_routines(server, server_token);
if (expr_eval_routines) if (expr_eval_routines)
@ -472,7 +473,7 @@ void write_server(const statement_list_t *stmts)
if (do_win32 && do_win64) if (do_win32 && do_win64)
{ {
fprintf(server, "\n#ifndef _WIN64\n\n"); fprintf(server, "#ifndef _WIN64\n\n");
pointer_size = 4; pointer_size = 4;
write_server_routines( stmts ); write_server_routines( stmts );
fprintf(server, "\n#else /* _WIN64 */\n\n"); fprintf(server, "\n#else /* _WIN64 */\n\n");