[ros-diffs] [ekohl] 37380: Sync to wine-1.0-rc11: - Francois Gouget <fgouget at free.fr> Tue, 6 May 2008 Add a comment warning when a table must be kept sorted for later use with bsearch(). - Francois Gouget <fgouget at free.fr> Tue, 6 May 2008 Assorted spelling fixes. - Marcus Meissner <marcus at jet.franken.de> Tue, 6 May 2008 widl: Mark non-returning functions as noreturn.

[ekohl at svn.reactos.org]

Author: ekohl
Date: Sat Nov 15 14:18:16 2008
New Revision: 37380

URL: http://svn.reactos.org/svn/reactos?rev=37380&view=rev
Log:
Sync to wine-1.0-rc11:

- Francois Gouget <fgouget at free.fr> Tue, 6 May 2008
Add a comment warning when a table must be kept sorted for later use with bsearch().

- Francois Gouget <fgouget at free.fr> Tue, 6 May 2008
Assorted spelling fixes.

- Marcus Meissner <marcus at jet.franken.de> Tue, 6 May 2008
widl: Mark non-returning functions as noreturn.

Modified:
    trunk/reactos/media/doc/README.WINE
    trunk/reactos/tools/widl/parser.l
    trunk/reactos/tools/widl/parser.tab.c
    trunk/reactos/tools/widl/parser.y
    trunk/reactos/tools/widl/parser.yy.c
    trunk/reactos/tools/widl/typelib.c
    trunk/reactos/tools/widl/utils.c
    trunk/reactos/tools/widl/utils.h

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -26,7 +26,7 @@
 reactos/tools/winebuild           # Synced to Wine-20081105 (~Wine-1.1.7)
 reactos/tools/wmc                 # Synced to Wine-20081105 (~Wine-1.1.7)
 reactos/tools/wrc                 # Synced to Wine-20081105 (~Wine-1.1.7)
-reactos/tools/widl                # Synced to Wine-0_9_61
+reactos/tools/widl                # Synced to Wine-1_0-rc1
 
 The following libraries are shared with Wine.
 

Modified: trunk/reactos/tools/widl/parser.l
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/parser.l [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/parser.l [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -198,6 +198,7 @@
 	int token;
 };
 
+/* This table MUST be alphabetically sorted on the kw field */
 static const struct keyword keywords[] = {
 	{"FALSE",			tFALSE},
 	{"NULL",			tNULL},
@@ -256,7 +257,9 @@
 };
 #define NKEYWORDS (sizeof(keywords)/sizeof(keywords[0]))
 
-/* keywords only recognized in attribute lists */
+/* keywords only recognized in attribute lists
+ * This table MUST be alphabetically sorted on the kw field
+ */
 static const struct keyword attr_keywords[] =
 {
         {"aggregatable",                tAGGREGATABLE},

Modified: trunk/reactos/tools/widl/parser.tab.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -4905,7 +4905,7 @@
         }
   }
 
-  /* v->type is currently pointing the the type on the left-side of the
+  /* v->type is currently pointing to the type on the left-side of the
    * declaration, so we need to fix this up so that it is the return type of the
    * function and make v->type point to the function side of the declaration */
   if (func_type)

Modified: trunk/reactos/tools/widl/parser.y
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -1592,7 +1592,7 @@
         }
   }
 
-  /* v->type is currently pointing the the type on the left-side of the
+  /* v->type is currently pointing to the type on the left-side of the
    * declaration, so we need to fix this up so that it is the return type of the
    * function and make v->type point to the function side of the declaration */
   if (func_type)

Modified: trunk/reactos/tools/widl/parser.yy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/parser.yy.c [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/parser.yy.c [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -1996,6 +1996,7 @@
 	int token;
 };
 
+/* This table MUST be alphabetically sorted on the kw field */
 static const struct keyword keywords[] = {
 	{"FALSE",			tFALSE},
 	{"NULL",			tNULL},
@@ -2054,7 +2055,9 @@
 };
 #define NKEYWORDS (sizeof(keywords)/sizeof(keywords[0]))
 
-/* keywords only recognized in attribute lists */
+/* keywords only recognized in attribute lists
+ * This table MUST be alphabetically sorted on the kw field
+ */
 static const struct keyword attr_keywords[] =
 {
         {"aggregatable",                tAGGREGATABLE},

Modified: trunk/reactos/tools/widl/typelib.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -100,8 +100,9 @@
 }
 
 /* List of oleauto types that should be recognized by name.
- * (most of) these seem to be intrinsic types in mktyplib. */
-
+ * (most of) these seem to be intrinsic types in mktyplib.
+ * This table MUST be alphabetically sorted on the kw field.
+ */
 static const struct oatype {
   const char *kw;
   unsigned short vt;

Modified: trunk/reactos/tools/widl/utils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/utils.c [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/utils.c [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -67,7 +67,7 @@
 
 
 /* yyerror:  yacc assumes this is not newline terminated.  */
-int parser_error(const char *s, ...)
+void parser_error(const char *s, ...)
 {
 	loc_info_t cur_location = CURRENT_LOCATION;
 	va_list ap;
@@ -76,7 +76,6 @@
 	fprintf(stderr, "\n");
 	va_end(ap);
 	exit(1);
-	return 1;
 }
 
 void error_loc(const char *s, ...)

Modified: trunk/reactos/tools/widl/utils.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- trunk/reactos/tools/widl/utils.h [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/utils.h [iso-8859-1] Sat Nov 15 14:18:16 2008
@@ -33,11 +33,11 @@
 #define __attribute__(X)
 #endif
 
-int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2)));
+void parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn));
 int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));
-void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2)));
-void error(const char *s, ...) __attribute__((format (printf, 1, 2)));
-void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3)));
+void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn));
+void error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn));
+void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))) __attribute__((noreturn));
 void warning(const char *s, ...) __attribute__((format (printf, 1, 2)));
 void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3)));
 void chat(const char *s, ...) __attribute__((format (printf, 1, 2)));