wine/tools/widl header.c
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Dec 2 07:15:39 CST 2005
ChangeSet ID: 21629
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/12/02 07:15:39
Modified files:
tools/widl : header.c
Log message:
Vincent Béron <vberon at mecano.gme.usherb.ca>
Use interface instead of struct where appropriate in widl.
Patch: http://cvs.winehq.org/patch.py?id=21629
Old revision New revision Changes Path
1.38 1.39 +10 -10 wine/tools/widl/header.c
Index: wine/tools/widl/header.c
diff -u -p wine/tools/widl/header.c:1.38 wine/tools/widl/header.c:1.39
--- wine/tools/widl/header.c:1.38 2 Dec 2005 13:15:39 -0000
+++ wine/tools/widl/header.c 2 Dec 2005 13:15:39 -0000
@@ -690,8 +690,8 @@ static void write_method_proto(type_t *i
fprintf(header, "void __RPC_STUB %s_", iface->name);
write_name(header,def);
fprintf(header, "_Stub(\n");
- fprintf(header, " struct IRpcStubBuffer* This,\n");
- fprintf(header, " struct IRpcChannelBuffer* pRpcChannelBuffer,\n");
+ fprintf(header, " interface IRpcStubBuffer* This,\n");
+ fprintf(header, " interface IRpcChannelBuffer* pRpcChannelBuffer,\n");
fprintf(header, " PRPC_MESSAGE pRpcMessage,\n");
fprintf(header, " DWORD* pdwStubPhase);\n");
@@ -762,9 +762,9 @@ void write_forward(type_t *iface)
* interface, since non-object interfaces shouldn't need forwards */
if ((!iface->defined || is_object(iface->attrs) || is_attr(iface->attrs, ATTR_DISPINTERFACE))
&& !iface->written) {
- fprintf(header,"#ifndef __%s_FWD_DEFINED__\n", iface->name);
- fprintf(header,"#define __%s_FWD_DEFINED__\n", iface->name);
- fprintf(header, "typedef struct %s %s;\n", iface->name, iface->name);
+ fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", iface->name);
+ fprintf(header, "#define __%s_FWD_DEFINED__\n", iface->name);
+ fprintf(header, "typedef interface %s %s;\n", iface->name, iface->name);
fprintf(header, "#endif\n\n" );
iface->written = TRUE;
}
@@ -806,7 +806,7 @@ static void write_com_interface(type_t *
fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n");
if (iface->ref)
{
- fprintf(header, "struct %s : public %s\n", iface->name, iface->ref->name);
+ fprintf(header, "%s : public %s\n", iface->name, iface->ref->name);
fprintf(header, "{\n");
indentation++;
write_cpp_method_def(iface);
@@ -815,7 +815,7 @@ static void write_com_interface(type_t *
}
else
{
- fprintf(header, "struct %s\n", iface->name);
+ fprintf(header, "%s\n", iface->name);
fprintf(header, "{\n");
fprintf(header, " BEGIN_INTERFACE\n");
fprintf(header, "\n");
@@ -828,7 +828,7 @@ static void write_com_interface(type_t *
fprintf(header, "#else\n");
/* C interface */
fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name);
- fprintf(header, "struct %s {\n", iface->name);
+ fprintf(header, "interface %s {\n", iface->name);
fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name);
fprintf(header, "};\n");
fprintf(header, "struct %sVtbl {\n", iface->name);
@@ -889,13 +889,13 @@ void write_dispinterface(type_t *iface)
write_forward(iface);
/* C++ interface */
fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n");
- fprintf(header, "struct %s : public %s\n", iface->name, iface->ref->name);
+ fprintf(header, "%s : public %s\n", iface->name, iface->ref->name);
fprintf(header, "{\n");
fprintf(header, "};\n");
fprintf(header, "#else\n");
/* C interface */
fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name);
- fprintf(header, "struct %s {\n", iface->name);
+ fprintf(header, "interface %s {\n", iface->name);
fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name);
fprintf(header, "};\n");
fprintf(header, "struct %sVtbl {\n", iface->name);
More information about the wine-cvs
mailing list