Modified: trunk/reactos/tools/widl/ChangeLog
Deleted: trunk/reactos/tools/widl/client.h
Modified: trunk/reactos/tools/widl/parser.y
Deleted: trunk/reactos/tools/widl/proxy.h
Modified: trunk/reactos/tools/widl/server.c
Deleted: trunk/reactos/tools/widl/server.h
Modified: trunk/reactos/tools/widl/typelib.c
Modified: trunk/reactos/tools/widl/widl.c
Modified: trunk/reactos/tools/widl/widl.h
Modified: trunk/reactos/tools/widl/y.tab.c
--- trunk/reactos/tools/widl/ChangeLog 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/ChangeLog 2005-02-27 22:55:54 UTC (rev 13772)
@@ -1,5 +1,21 @@
ChangeLog
+2005-02-27 sedwards
+ tools/widl/y.tab.c
+ tools/widl/parser.y
+ tools/widl/widl.c
+ tools/widl/widl.h
+ tools/widl/server.c
+ tools/widl/typelib.c
+
+Merge in Winehq changes to reduce noise.
+
+ tools/widl/server.h
+ tools/widl/client.h
+ tools/widl/proxy.h
+
+Deleted unneeded headers.
+
2005-02-26 ekohl
tools/widl/server.c
--- trunk/reactos/tools/widl/client.h 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/client.h 2005-02-27 22:55:54 UTC (rev 13772)
@@ -1,26 +0,0 @@
-/*
- * IDL Compiler
- *
- * Copyright 2005 Eric Kohl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WIDL_CLIENT_H
-#define __WIDL_CLIENT_H
-
-extern void write_client(ifref_t *ifaces);
-
-#endif
--- trunk/reactos/tools/widl/parser.y 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/parser.y 2005-02-27 22:55:54 UTC (rev 13772)
@@ -35,10 +35,7 @@
#include "utils.h"
#include "parser.h"
#include "header.h"
-#include "proxy.h"
#include "typelib.h"
-#include "client.h"
-#include "server.h"
#if defined(YYBYACC)
/* Berkeley yacc (byacc) doesn't seem to know about these */
--- trunk/reactos/tools/widl/proxy.h 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/proxy.h 2005-02-27 22:55:54 UTC (rev 13772)
@@ -1,26 +0,0 @@
-/*
- * IDL Compiler
- *
- * Copyright 2002 Ove Kaaven
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WIDL_PROXY_H
-#define __WIDL_PROXY_H
-
-extern void write_proxies(ifref_t *ifaces);
-
-#endif
--- trunk/reactos/tools/widl/server.c 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/server.c 2005-02-27 22:55:54 UTC (rev 13772)
@@ -255,6 +255,7 @@
default:
error("Unknown/unsupported type: %s\n", type->name);
+ return 0;
}
}
--- trunk/reactos/tools/widl/server.h 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/server.h 2005-02-27 22:55:54 UTC (rev 13772)
@@ -1,26 +0,0 @@
-/*
- * IDL Compiler
- *
- * Copyright 2005 Eric Kohl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WIDL_SERVER_H
-#define __WIDL_SERVER_H
-
-extern void write_server(ifref_t *ifaces);
-
-#endif
--- trunk/reactos/tools/widl/typelib.c 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/typelib.c 2005-02-27 22:55:54 UTC (rev 13772)
@@ -144,7 +144,8 @@
if(match(t->name, "IDispatch"))
return VT_DISPATCH;
return VT_USERDEFINED;
-
+
+ case RPC_FC_ENUM16:
case RPC_FC_STRUCT:
case RPC_FC_PSTRUCT:
return VT_USERDEFINED;
--- trunk/reactos/tools/widl/widl.c 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/widl.c 2005-02-27 22:55:54 UTC (rev 13772)
@@ -36,7 +36,6 @@
#include "widl.h"
#include "utils.h"
#include "parser.h"
-#include "proxy.h"
#include "wine/wpp.h"
/* future options to reserve characters for: */
--- trunk/reactos/tools/widl/widl.h 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/widl.h 2005-02-27 22:55:54 UTC (rev 13772)
@@ -60,4 +60,8 @@
extern FILE* header;
+extern void write_proxies(ifref_t *ifaces);
+extern void write_client(ifref_t *ifaces);
+extern void write_server(ifref_t *ifaces);
+
#endif
--- trunk/reactos/tools/widl/y.tab.c 2005-02-27 21:40:32 UTC (rev 13771)
+++ trunk/reactos/tools/widl/y.tab.c 2005-02-27 22:55:54 UTC (rev 13772)
@@ -164,10 +164,7 @@
#include "utils.h"
#include "parser.h"
#include "header.h"
-#include "proxy.h"
#include "typelib.h"
-#include "client.h"
-#include "server.h"
#if defined(YYBYACC)
/* Berkeley yacc (byacc) doesn't seem to know about these */