widl: Don't output __RPC_FAR in generated code.
This commit is contained in:
parent
019aef9f5f
commit
fea330364b
|
@ -153,9 +153,9 @@ static void write_function_stubs(type_t *iface)
|
||||||
print_client("NdrSendReceive(\n");
|
print_client("NdrSendReceive(\n");
|
||||||
indent++;
|
indent++;
|
||||||
print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n");
|
print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n");
|
||||||
print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer);\n");
|
print_client("(unsigned char *)_StubMsg.Buffer);\n");
|
||||||
/* print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); */
|
/* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */
|
||||||
/* print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); */
|
/* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */
|
||||||
indent--;
|
indent--;
|
||||||
|
|
||||||
/* unmarshal return value */
|
/* unmarshal return value */
|
||||||
|
@ -174,7 +174,7 @@ static void write_function_stubs(type_t *iface)
|
||||||
|
|
||||||
print_client("_RetVal = *((");
|
print_client("_RetVal = *((");
|
||||||
write_type(client, def->type, def, def->tname);
|
write_type(client, def->type, def, def->tname);
|
||||||
fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n");
|
fprintf(client, " *)_StubMsg.Buffer)++;\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update proc_offset */
|
/* update proc_offset */
|
||||||
|
@ -244,7 +244,7 @@ static void write_stubdescriptor(type_t *iface)
|
||||||
print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);
|
print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);
|
||||||
print_client("{\n");
|
print_client("{\n");
|
||||||
indent++;
|
indent++;
|
||||||
print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name);
|
print_client("(void *)& %s___RpcClientInterface,\n", iface->name);
|
||||||
print_client("MIDL_user_allocate,\n");
|
print_client("MIDL_user_allocate,\n");
|
||||||
print_client("MIDL_user_free,\n");
|
print_client("MIDL_user_free,\n");
|
||||||
if (implicit_handle)
|
if (implicit_handle)
|
||||||
|
|
|
@ -216,12 +216,12 @@ static void write_function_stubs(type_t *iface)
|
||||||
print_server("RpcRaiseException(_Status);\n");
|
print_server("RpcRaiseException(_Status);\n");
|
||||||
indent--;
|
indent--;
|
||||||
fprintf(server, "\n");
|
fprintf(server, "\n");
|
||||||
print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)_pRpcMessage->Buffer;\n");
|
print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n");
|
||||||
fprintf(server, "\n");
|
fprintf(server, "\n");
|
||||||
|
|
||||||
print_server("*((");
|
print_server("*((");
|
||||||
write_type(server, def->type, def, def->tname);
|
write_type(server, def->type, def, def->tname);
|
||||||
fprintf(server, " __RPC_FAR *)_StubMsg.Buffer)++ = _RetVal;\n");
|
fprintf(server, " *)_StubMsg.Buffer)++ = _RetVal;\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
indent--;
|
indent--;
|
||||||
|
@ -306,7 +306,7 @@ static void write_stubdescriptor(type_t *iface)
|
||||||
print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);
|
print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name);
|
||||||
print_server("{\n");
|
print_server("{\n");
|
||||||
indent++;
|
indent++;
|
||||||
print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name);
|
print_server("(void *)& %s___RpcServerInterface,\n", iface->name);
|
||||||
print_server("MIDL_user_allocate,\n");
|
print_server("MIDL_user_allocate,\n");
|
||||||
print_server("MIDL_user_free,\n");
|
print_server("MIDL_user_free,\n");
|
||||||
print_server("0,\n");
|
print_server("0,\n");
|
||||||
|
|
|
@ -236,7 +236,7 @@ void marshall_arguments(FILE *file, int indent, func_t *func)
|
||||||
|
|
||||||
print_file(file, indent, "*((");
|
print_file(file, indent, "*((");
|
||||||
write_type(file, var->type, var, var->tname);
|
write_type(file, var->type, var, var->tname);
|
||||||
fprintf(file, " __RPC_FAR*)_StubMsg.Buffer)++ = ");
|
fprintf(file, " *)_StubMsg.Buffer)++ = ");
|
||||||
write_name(file, var);
|
write_name(file, var);
|
||||||
fprintf(file, ";\n");
|
fprintf(file, ";\n");
|
||||||
fprintf(file, "\n");
|
fprintf(file, "\n");
|
||||||
|
@ -306,7 +306,7 @@ void unmarshall_arguments(FILE *file, int indent, func_t *func)
|
||||||
write_name(file, var);
|
write_name(file, var);
|
||||||
fprintf(file, " = *((");
|
fprintf(file, " = *((");
|
||||||
write_type(file, var->type, var, var->tname);
|
write_type(file, var->type, var, var->tname);
|
||||||
fprintf(file, " __RPC_FAR*)_StubMsg.Buffer)++;\n");
|
fprintf(file, " *)_StubMsg.Buffer)++;\n");
|
||||||
fprintf(file, "\n");
|
fprintf(file, "\n");
|
||||||
|
|
||||||
last_size = size;
|
last_size = size;
|
||||||
|
|
Loading…
Reference in New Issue