merge in Winehq changes to reduce noise

svn path=/trunk/; revision=13772

diff --git a/reactos/tools/widl/ChangeLog b/reactos/tools/widl/ChangeLog
index d6ee53f..28d6751 100644 (file)
--- a/reactos/tools/widl/ChangeLog
+++ b/reactos/tools/widl/ChangeLog
@@ -1,5 +1,21 @@
 ChangeLog\r
+2005-02-27 sedwards\r
 \r
+  tools/widl/y.tab.c\r
+  tools/widl/parser.y\r
+  tools/widl/widl.c\r
+  tools/widl/widl.h\r
+  tools/widl/server.c\r
+  tools/widl/typelib.c\r
+\r
+Merge in Winehq changes to reduce noise.\r
+  \r
+  tools/widl/server.h\r
+  tools/widl/client.h\r
+  tools/widl/proxy.h  \r
+\r
+Deleted unneeded headers.  \r
+    \r
 2005-02-26 ekohl\r
   tools/widl/server.c\r
 \r

diff --git a/reactos/tools/widl/client.h b/reactos/tools/widl/client.h
deleted file mode 100644 (file)
index d548348..0000000
--- a/reactos/tools/widl/client.h
+++ /dev/null
@@ -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

diff --git a/reactos/tools/widl/parser.y b/reactos/tools/widl/parser.y
index f0f3af9..4d27f2f 100644 (file)
--- a/reactos/tools/widl/parser.y
+++ b/reactos/tools/widl/parser.y
@@ -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 */

diff --git a/reactos/tools/widl/proxy.h b/reactos/tools/widl/proxy.h
deleted file mode 100644 (file)
index fb32b5e..0000000
--- a/reactos/tools/widl/proxy.h
+++ /dev/null
@@ -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

diff --git a/reactos/tools/widl/server.c b/reactos/tools/widl/server.c
index da4b49d..dca83ac 100644 (file)
--- a/reactos/tools/widl/server.c
+++ b/reactos/tools/widl/server.c
@@ -255,6 +255,7 @@ unsigned int get_required_buffer_size(type_t *type)
 \r
         default:\r
             error("Unknown/unsupported type: %s\n", type->name);\r
+            return 0;\r
     }\r
 }\r
 \r

diff --git a/reactos/tools/widl/server.h b/reactos/tools/widl/server.h
deleted file mode 100644 (file)
index c96fbe1..0000000
--- a/reactos/tools/widl/server.h
+++ /dev/null
@@ -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

diff --git a/reactos/tools/widl/typelib.c b/reactos/tools/widl/typelib.c
index c597138..bb11514 100644 (file)
--- a/reactos/tools/widl/typelib.c
+++ b/reactos/tools/widl/typelib.c
@@ -144,7 +144,8 @@ unsigned short get_type_vt(type_t *t)
     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;

diff --git a/reactos/tools/widl/widl.c b/reactos/tools/widl/widl.c
index be5d9da..b952b5a 100644 (file)
--- a/reactos/tools/widl/widl.c
+++ b/reactos/tools/widl/widl.c
@@ -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: */

diff --git a/reactos/tools/widl/widl.h b/reactos/tools/widl/widl.h
index b9d6474..5b303c3 100644 (file)
--- a/reactos/tools/widl/widl.h
+++ b/reactos/tools/widl/widl.h
@@ -60,4 +60,8 @@ extern int char_number;
 
 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

diff --git a/reactos/tools/widl/y.tab.c b/reactos/tools/widl/y.tab.c
index ac3867e..082d19f 100644 (file)
--- a/reactos/tools/widl/y.tab.c
+++ b/reactos/tools/widl/y.tab.c
@@ -164,10 +164,7 @@
 #include "utils.h"\r
 #include "parser.h"\r
 #include "header.h"\r
-#include "proxy.h"\r
 #include "typelib.h"\r
-#include "client.h"\r
-#include "server.h"\r
 \r
 #if defined(YYBYACC)\r
        /* Berkeley yacc (byacc) doesn't seem to know about these */\r