[prev in list] [next in list] [prev in thread] [next in thread]
List: ros-diffs
Subject: [ros-diffs] [sedwards] 13772: merge in Winehq changes to reduce
From: <sedwards () svn ! reactos ! com>
Date: 2005-02-27 22:55:55
Message-ID: 000001c51d1f$7e7d9c00$6601a8c0 () penelope
[Download RAW message or body]
merge in Winehq changes to reduce noise
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
_____
Modified: trunk/reactos/tools/widl/ChangeLog
--- 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
_____
Deleted: trunk/reactos/tools/widl/client.h
--- 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
_____
Modified: trunk/reactos/tools/widl/parser.y
--- 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 */
_____
Deleted: trunk/reactos/tools/widl/proxy.h
--- 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
_____
Modified: trunk/reactos/tools/widl/server.c
--- 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;
}
}
_____
Deleted: trunk/reactos/tools/widl/server.h
--- 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
_____
Modified: trunk/reactos/tools/widl/typelib.c
--- 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;
_____
Modified: trunk/reactos/tools/widl/widl.c
--- 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: */
_____
Modified: trunk/reactos/tools/widl/widl.h
--- 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
_____
Modified: trunk/reactos/tools/widl/y.tab.c
--- 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 */
[Attachment #3 (text/html)]
<html>
<head>
<style>
<!--
body { background-color:#ffffff }
.file { border:1px solid #eeeeee; margin-top:1em; margin-bottom:1em }
.pathname { font-family:monospace; float:right }
.fileheader { margin-bottom:.5em }
.diff { margin:0 }
.tasklist { padding:4px; border:1px dashed #000000; margin-top:1em }
.tasklist ul { margin-top:0; margin-bottom:0 }
tr.alt { background-color:#eeeeee }
#added { background-color:#ddffdd }
#addedchars { background-color:#99ff99; font-weight:bolder }
tr.alt #added { background-color:#ccf7cc }
#removed { background-color:#ffdddd }
#removedchars { background-color:#ff9999; font-weight:bolder }
tr.alt #removed { background-color:#f7cccc }
#info { color:#888888 }
#context { background-color:#eeeeee }
td {padding-left:.3em; padding-right:.3em }
tr.head { border-bottom-width:1px; border-bottom-style:solid }
tr.head td { padding:0; padding-top:.2em }
.task { background-color:#ffff00 }
.comment { padding:4px; border:1px dashed #000000; background-color:#ffffdd }
.error { color:red }
hr { border-width:0px; height:2px; background:black }
-->
</style>
</head>
<body>
<pre class="comment">merge in Winehq changes to reduce noise</pre><pre class="diff" \
id="context">Modified: trunk/reactos/tools/widl/ChangeLog </pre><pre class="diff" \
id="removed">Deleted: trunk/reactos/tools/widl/client.h </pre><pre class="diff" \
id="context">Modified: trunk/reactos/tools/widl/parser.y </pre><pre class="diff" \
id="removed">Deleted: trunk/reactos/tools/widl/proxy.h </pre><pre class="diff" \
id="context">Modified: trunk/reactos/tools/widl/server.c </pre><pre class="diff" \
id="removed">Deleted: trunk/reactos/tools/widl/server.h </pre><pre class="diff" \
id="context">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
</pre><hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/ChangeLog</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> ChangeLog
</pre><pre class="diff" id="added">+2005-02-27 sedwards
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ 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.
+
</pre><pre class="diff" id="context"> 2005-02-26 ekohl
tools/widl/server.c
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Deleted: \
trunk/reactos/tools/widl/client.h</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="removed">-/*
- * 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
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/parser.y</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> #include "utils.h"
#include "parser.h"
#include "header.h"
</pre><pre class="diff" id="removed">-#include "proxy.h"
</pre><pre class="diff" id="context"> #include "typelib.h"
</pre><pre class="diff" id="removed">-#include "client.h"
-#include "server.h"
</pre><pre class="diff" id="context">
#if defined(YYBYACC)
/* Berkeley yacc (byacc) doesn't seem to know about these */
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Deleted: \
trunk/reactos/tools/widl/proxy.h</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="removed">-/*
- * 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
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/server.c</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context">
default:
error("Unknown/unsupported type: \
%s\n", type->name); </pre><pre class="diff" id="added">+ \
return 0; </pre><pre class="diff" id="context"> }
}
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Deleted: \
trunk/reactos/tools/widl/server.h</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="removed">-/*
- * 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
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/typelib.c</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> if(match(t->name, \
"IDispatch")) return VT_DISPATCH;
return VT_USERDEFINED;
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="added">+
+ case RPC_FC_ENUM16:
</pre><pre class="diff" id="context"> case RPC_FC_STRUCT:
case RPC_FC_PSTRUCT:
return VT_USERDEFINED;
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/widl.c</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> #include "widl.h"
#include "utils.h"
#include "parser.h"
</pre><pre class="diff" id="removed">-#include "proxy.h"
</pre><pre class="diff" id="context"> #include "wine/wpp.h"
/* future options to reserve characters for: */
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/widl.h</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context">
extern FILE* header;
</pre><pre class="diff" id="added">+extern void write_proxies(ifref_t *ifaces);
+extern void write_client(ifref_t *ifaces);
+extern void write_server(ifref_t *ifaces);
+
</pre><pre class="diff" id="context"> #endif
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: \
trunk/reactos/tools/widl/y.tab.c</b></big></div> <pre class="diff"><small \
id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> #include "utils.h"
#include "parser.h"
#include "header.h"
</pre><pre class="diff" id="removed">-#include "proxy.h"
</pre><pre class="diff" id="context"> #include "typelib.h"
</pre><pre class="diff" id="removed">-#include "client.h"
-#include "server.h"
</pre><pre class="diff" id="context">
#if defined(YYBYACC)
/* Berkeley yacc (byacc) doesn't seem to know about these */
</pre>
</div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic