Updated "widl_ros.diff" file.

I created it with SVN's diff command against our vendor-imported widl version, but it is also possible to patch the Wine widl CVS version with it.

svn path=/trunk/; revision=31816
This commit is contained in:
Colin Finck 2008-01-15 21:54:49 +00:00
parent ec72c52773
commit a89e08f7e8

View file

@ -1,8 +1,8 @@
--- hash.c Fri Sep 29 17:48:44 2006
+++ hash.c Fri Jan 11 17:49:22 2008
@@ -19,13 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
Index: hash.c
===================================================================
--- hash.c (revision 31815)
+++ hash.c (working copy)
@@ -21,9 +21,7 @@
#include <stdio.h>
#include <stdarg.h>
@ -13,11 +13,7 @@
#include "hash.h"
static const unsigned char Lookup_16[128 * 3] = {
/* Common */
@@ -533,17 +531,24 @@
case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN:
case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI:
@@ -535,6 +533,7 @@
case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL:
case LANG_TATAR: case LANG_TELUGU: case LANG_THAI:
case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK:
@ -25,7 +21,7 @@
case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE:
case LANG_TAJIK: case LANG_ROMANSH: case LANG_IRISH:
case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU:
case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA:
@@ -542,6 +541,12 @@
case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO:
case LANG_WALON: case LANG_CORNISH: case LANG_WELSH:
case LANG_BRETON:
@ -38,13 +34,11 @@
nOffset = 16;
pnLookup = Lookup_16;
break;
case LANG_CZECH: case LANG_HUNGARIAN: case LANG_POLISH:
case LANG_SLOVAK: case LANG_SPANISH:
--- server.c Sat Jan 05 20:48:36 2008
+++ server.c Fri Jan 11 17:49:21 2008
@@ -388,10 +388,11 @@
error("Could not open %s for output\n", server_name);
Index: server.c
===================================================================
--- server.c (revision 31815)
+++ server.c (working copy)
@@ -390,6 +390,7 @@
print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name);
print_server("#include <string.h>\n");
fprintf(server, "\n");
@ -52,13 +46,11 @@
print_server("#include \"%s\"\n", header_name);
fprintf(server, "\n");
}
--- typelib.c Sat Jan 05 20:48:36 2008
+++ typelib.c Fri Jan 11 17:49:21 2008
@@ -33,12 +33,11 @@
#include <signal.h>
Index: typelib.c
===================================================================
--- typelib.c (revision 31815)
+++ typelib.c (working copy)
@@ -35,8 +35,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
@ -68,31 +60,39 @@
#include "widl.h"
#include "utils.h"
#include "parser.h"
#include "header.h"
--- widl.c Sat Jan 05 20:48:36 2008
+++ widl.c Fri Jan 11 17:49:21 2008
@@ -547,10 +547,15 @@
return 1;
}
}
Index: utils.c
===================================================================
--- utils.c (revision 31815)
+++ utils.c (working copy)
@@ -136,6 +136,9 @@
name = "widl.tab";
if(do_header) {
+ if (strrchr(header_name, '\\'))
+ header_token = make_token(strrchr(header_name, '\\') + 1);
+ else if (strrchr(header_name, '/'))
+ header_token = make_token(strrchr(header_name, '/') + 1);
+ else
header_token = make_token(header_name);
slash = strrchr(name, '/');
+ if (!slash)
+ slash = strrchr(name, '\\');
+
if (slash)
name = slash + 1;
if(!(header = fopen(header_name, "w"))) {
fprintf(stderr, "Could not open %s for output\n", header_name);
return 1;
--- widltypes.h Sat Jan 05 20:48:36 2008
+++ widltypes.h Fri Jan 11 17:49:22 2008
@@ -19,10 +19,17 @@
*/
Index: widl.c
===================================================================
--- widl.c (revision 31815)
+++ widl.c (working copy)
@@ -166,6 +166,9 @@
int i;
slash = strrchr(name, '/');
+ if(!slash)
+ slash = strrchr(name, '\\');
+
if (slash) name = slash + 1;
token = xstrdup(name);
Index: widltypes.h
===================================================================
--- widltypes.h (revision 31815)
+++ widltypes.h (working copy)
@@ -21,6 +21,13 @@
#ifndef __WIDL_WIDLTYPES_H
#define __WIDL_WIDLTYPES_H
@ -106,13 +106,11 @@
#include <stdarg.h>
#include "guiddef.h"
#include "wine/rpcfc.h"
#include "wine/list.h"
--- write_msft.c Sat Jan 05 20:48:36 2008
+++ write_msft.c Fri Jan 11 17:49:22 2008
@@ -38,14 +38,12 @@
#include <time.h>
Index: write_msft.c
===================================================================
--- write_msft.c (revision 31815)
+++ write_msft.c (working copy)
@@ -40,10 +40,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
@ -125,5 +123,3 @@
#include "widltypes.h"
#include "typelib.h"
#include "typelib_struct.h"
#include "utils.h"