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

Various formatting fixes.

This commit is contained in:
Mike McCormack 2004-09-21 20:04:47 +00:00 committed by Alexandre Julliard
parent 9a75ae0a2f
commit d8d2d96da2
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tools/widl/proxy.c
View File

@ -262,7 +262,7 @@ static void marshall_size_arg( var_t *arg )
temp.type = type->ref; temp.type = type->ref;
temp.name = arg->name; /* FIXME */ temp.name = arg->name; /* FIXME */
#if 0 #if 0
print_proxy( "/* FIXME: %s use the right name for %s\n", __FUNCTION__, arg->name ); print_proxy( "/* FIXME: %s use the right name for %s */\n", __FUNCTION__, arg->name );
#endif #endif
marshall_size_arg( &temp ); marshall_size_arg( &temp );
} }
@ -349,7 +349,7 @@ static void marshall_copy_arg( var_t *arg )
temp.type = type->ref; temp.type = type->ref;
temp.name = arg->name; /* FIXME */ temp.name = arg->name; /* FIXME */
#if 0 #if 0
print_proxy( "/* FIXME: %s use the right name for %s\n", __FUNCTION__, arg->name ); print_proxy( "/* FIXME: %s use the right name for %s */\n", __FUNCTION__, arg->name );
#endif #endif
marshall_copy_arg( &temp ); marshall_copy_arg( &temp );
} }
@ -446,7 +446,7 @@ static void unmarshall_copy_arg( var_t *arg )
temp.type = type->ref; temp.type = type->ref;
temp.name = arg->name; /* FIXME */ temp.name = arg->name; /* FIXME */
#if 1 #if 1
print_proxy( "/* FIXME: %s use the right name for %s\n", __FUNCTION__, arg->name ); print_proxy( "/* FIXME: %s use the right name for %s */\n", __FUNCTION__, arg->name );
#endif #endif
unmarshall_copy_arg( &temp ); unmarshall_copy_arg( &temp );
} }
@ -896,15 +896,23 @@ static void write_proxy(type_t *iface)
} }
/* proxy vtable */ /* proxy vtable */
print_proxy( "const CINTERFACE_PROXY_VTABLE(%d) %sProxyVtbl =\n", midx, iface->name); print_proxy( "const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", midx, iface->name);
print_proxy( "{\n");
indent++;
print_proxy( "{\n", iface->name);
indent++;
print_proxy( "&IID_%s,\n", iface->name);
indent--;
print_proxy( "},\n");
print_proxy( "{\n"); print_proxy( "{\n");
indent++; indent++;
print_proxy( "{&IID_%s},{\n", iface->name);
write_proxy_methods(iface); write_proxy_methods(iface);
fprintf(proxy, "}\n"); fprintf(proxy, "\n");
indent--;
print_proxy( "}\n");
indent--; indent--;
print_proxy( "};\n"); print_proxy( "};\n");
print_proxy( "\n"); fprintf(proxy, "\n\n");
/* stub vtable */ /* stub vtable */
print_proxy( "static const PRPC_STUB_FUNCTION %s_table[] =\n", iface->name); print_proxy( "static const PRPC_STUB_FUNCTION %s_table[] =\n", iface->name);
@ -915,13 +923,22 @@ static void write_proxy(type_t *iface)
indent--; indent--;
fprintf(proxy, "};\n"); fprintf(proxy, "};\n");
print_proxy( "\n"); print_proxy( "\n");
print_proxy( "const CInterfaceStubVtbl %sStubVtbl = {\n", iface->name); print_proxy( "const CInterfaceStubVtbl _%sStubVtbl =\n", iface->name);
print_proxy( "{\n");
indent++; indent++;
print_proxy( "{&IID_%s,\n", iface->name); print_proxy( "{\n");
print_proxy( " 0,\n"); indent++;
print_proxy( " %d,\n", stubs+3); print_proxy( "&IID_%s,\n", iface->name);
print_proxy( " &%s_table[-3]},\n", iface->name); print_proxy( "0,\n");
print_proxy( "{CStdStubBuffer_METHODS}\n"); print_proxy( "%d,\n", stubs+3);
print_proxy( "&%s_table[-3],\n", iface->name);
indent--;
print_proxy( "},\n", iface->name);
print_proxy( "{\n");
indent++;
print_proxy( "CStdStubBuffer_METHODS\n");
indent--;
print_proxy( "}\n");
indent--; indent--;
print_proxy( "};\n"); print_proxy( "};\n");
print_proxy( "\n"); print_proxy( "\n");
@ -964,7 +981,7 @@ void write_proxies(ifref_t *ifaces)
while (cur) { while (cur) {
if(cur->iface->ref && cur->iface->funcs && if(cur->iface->ref && cur->iface->funcs &&
is_object(cur->iface->attrs) && !is_local(cur->iface->attrs)) is_object(cur->iface->attrs) && !is_local(cur->iface->attrs))
fprintf(proxy, " (CInterfaceProxyVtbl*)&%sProxyVtbl,\n", cur->iface->name); fprintf(proxy, " (CInterfaceProxyVtbl*)&_%sProxyVtbl,\n", cur->iface->name);
cur = PREV_LINK(cur); cur = PREV_LINK(cur);
} }
fprintf(proxy, " 0\n"); fprintf(proxy, " 0\n");
@ -977,14 +994,14 @@ void write_proxies(ifref_t *ifaces)
while (cur) { while (cur) {
if(cur->iface->ref && cur->iface->funcs && if(cur->iface->ref && cur->iface->funcs &&
is_object(cur->iface->attrs) && !is_local(cur->iface->attrs)) is_object(cur->iface->attrs) && !is_local(cur->iface->attrs))
fprintf(proxy, " (CInterfaceStubVtbl*)&%sStubVtbl,\n", cur->iface->name); fprintf(proxy, " (CInterfaceStubVtbl*)&_%sStubVtbl,\n", cur->iface->name);
cur = PREV_LINK(cur); cur = PREV_LINK(cur);
} }
fprintf(proxy, " 0\n"); fprintf(proxy, " 0\n");
fprintf(proxy, "};\n"); fprintf(proxy, "};\n");
fprintf(proxy, "\n"); fprintf(proxy, "\n");
fprintf(proxy, "const PCInterfaceName _%s_InterfaceNamesList[] =\n", file_id); fprintf(proxy, "PCInterfaceName const _%s_InterfaceNamesList[] =\n", file_id);
fprintf(proxy, "{\n"); fprintf(proxy, "{\n");
cur = lcur; cur = lcur;
while (cur) { while (cur) {
@ -1006,7 +1023,8 @@ void write_proxies(ifref_t *ifaces)
while (cur) { while (cur) {
if(cur->iface->ref) if(cur->iface->ref)
{ {
fprintf(proxy, " if (!_%s_CHECK_IID(%d)) {\n", file_id, c); fprintf(proxy, " if (!_%s_CHECK_IID(%d))\n", file_id, c);
fprintf(proxy, " {\n");
fprintf(proxy, " *pIndex = %d;\n", c); fprintf(proxy, " *pIndex = %d;\n", c);
fprintf(proxy, " return 1;\n"); fprintf(proxy, " return 1;\n");
fprintf(proxy, " }\n"); fprintf(proxy, " }\n");