September 2006 - Wine-commits

Alexandre Julliard : wmc: Change the prefix on bison-generated names to avoid the name-prefix directive .
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 4f0fa2608a4bf9ea40da9d234def91aad3806405 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f0fa2608a4bf9ea40da9d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:05:15 2006 +0200 wmc: Change the prefix on bison-generated names to avoid the name-prefix directive. --- tools/wmc/mcl.c | 18 +++++++++--------- tools/wmc/mcy.y | 8 +++----- tools/wmc/utils.c | 8 ++++---- tools/wmc/utils.h | 4 ++-- tools/wmc/wmc.c | 6 +++--- tools/wmc/wmc.h | 6 +++--- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 99abfad..62cdf25 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -302,7 +302,7 @@ #endif if(!n) { - yywarning("Re-read line (input was or converted to zilch)"); + mcy_warning("Re-read line (input was or converted to zilch)"); goto try_again; /* Should not happen, but could be due to stdin reading and a signal */ } @@ -490,7 +490,7 @@ static int scan_number(int ch) else { unget_unichar(ch); - yylval.num = 0; + mcy_lval.num = 0; return tNUMBER; } break; @@ -535,7 +535,7 @@ static int scan_number(int ch) finish: unget_unichar(ch); push_char(0); - yylval.num = strtoul(get_char_stack(), NULL, base); + mcy_lval.num = strtoul(get_char_stack(), NULL, base); return tNUMBER; } @@ -586,7 +586,7 @@ void get_tokentable(token_t **tab, int * * The scanner * */ -int yylex(void) +int mcy_lex(void) { static const WCHAR ustr_dot1[] = { '.', '\n', 0 }; static const WCHAR ustr_dot2[] = { '.', '\r', '\n', 0 }; @@ -639,7 +639,7 @@ int yylex(void) set_codepage(WMC_DEFAULT_CODEPAGE); return tMSGEND; } - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tLINE; } @@ -677,7 +677,7 @@ int yylex(void) unget_unichar(ch); push_unichar(0); want_file = 0; - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tFILE; } @@ -693,7 +693,7 @@ int yylex(void) push_unichar(0); if(!(tok = lookup_token(get_unichar_stack()))) { - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tIDENT; } switch(tok->type) @@ -706,7 +706,7 @@ int yylex(void) /* Fall through */ case tok_severity: case tok_facility: - yylval.tok = tok; + mcy_lval.tok = tok; return tTOKEN; default: @@ -738,7 +738,7 @@ int yylex(void) newline(); push_unichar(ch); /* Include the newline */ push_unichar(0); - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tCOMMENT; default: xyyerror("Invalid character '%c' (0x%04x)", isisochar(ch) && isprint(ch) ? ch : '.', ch); diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index abe5d02..fad56de 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -95,8 +95,6 @@ static cp_xlat_t *find_cpxlat(int lan); %} -%name-prefix="yy" - %union { WCHAR *str; unsigned num; @@ -231,7 +229,7 @@ lmap : token '=' tNUMBER setfile ':' tFI $1->codepage = $7; do_add_token(tok_language, $1, "language"); if(!find_language($3) && !find_cpxlat($3)) - yywarning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override", $3, WMC_DEFAULT_CODEPAGE); + mcy_warning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override", $3, WMC_DEFAULT_CODEPAGE); } | token '=' tNUMBER setfile ':' error { xyyerror("Filename expected"); } | token '=' tNUMBER error { xyyerror(err_colon); } @@ -421,7 +419,7 @@ static void do_add_token(tok_e type, tok if(tp) { if(tok->type != type) - yywarning("Type change in token"); + mcy_warning("Type change in token"); if(tp != tok) xyyerror("Overlapping token not the same"); /* else its already defined and changed */ @@ -444,7 +442,7 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lc lmp->msg = msg; lmp->len = unistrlen(msg) + 1; /* Include termination */ if(lmp->len > 4096) - yywarning("Message exceptionally long; might be a missing termination"); + mcy_warning("Message exceptionally long; might be a missing termination"); return lmp; } diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 6b2de4c..2b3b87c 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -49,7 +49,7 @@ static void generic_msg(const char *s, c * The extra routine 'xyyerror' is used to exit after giving a real * message. */ -int yyerror(const char *s, ...) +int mcy_error(const char *s, ...) { #ifndef SUPPRESS_YACC_ERROR_MESSAGE va_list ap; @@ -70,7 +70,7 @@ int xyyerror(const char *s, ...) return 1; } -int yywarning(const char *s, ...) +int mcy_warning(const char *s, ...) { va_list ap; va_start(ap, s); @@ -215,7 +215,7 @@ int unistricmp(const WCHAR *s1, const WC if(!once) { once++; - yywarning(warn); + mcy_warning(warn); } i = *s1++ - *s2++; } @@ -228,7 +228,7 @@ int unistricmp(const WCHAR *s1, const WC if((*s1 & 0xffff) > 0x7f || (*s2 & 0xffff) > 0x7f) { if(!once) - yywarning(warn); + mcy_warning(warn); return *s1 - *s2; } else diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index 361917a..5a1faf1 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -33,9 +33,9 @@ #ifndef __GNUC__ #define __attribute__(X) #endif -int yyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); +int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int xyyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); -int yywarning(const char *s, ...) __attribute__((format (printf, 1, 2))); +int mcy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 4dd9889..2941219 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -113,7 +113,7 @@ int char_number = 1; /* The current cha char *cmdline; /* The entire commandline */ time_t now; /* The time of start of wmc */ -int yydebug; +int mcy_debug; int getopt (int argc, char *const *argv, const char *optstring); static void segvhandler(int sig); @@ -239,7 +239,7 @@ #endif return 1; } - yydebug = dodebug; + mcy_debug = dodebug; if(dodebug) { setbuf(stdout, 0); @@ -273,7 +273,7 @@ #endif else yyin = stdin; - ret = yyparse(); + ret = mcy_parse(); if(input_name) fclose(yyin); diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index b18c7f0..86ccd6f 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -56,15 +56,15 @@ extern time_t now; extern int line_number; extern int char_number; -int yyparse(void); -extern int yydebug; +int mcy_parse(void); +extern int mcy_debug; extern int want_nl; extern int want_line; extern int want_file; extern node_t *nodehead; extern lan_blk_t *lanblockhead; -int yylex(void); +int mcy_lex(void); FILE *yyin; void set_codepage(int cp);

1 0

Alexandre Julliard : wrc: Change the prefix on bison-generated names to avoid the name-prefix directive .
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 42418fbbe89f068e2542c78163c7952d24627068 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42418fbbe89f068e2542c78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:05:20 2006 +0200 wrc: Change the prefix on bison-generated names to avoid the name-prefix directive. --- tools/wrc/newstruc.c | 44 +++++++++++------------ tools/wrc/parser.h | 10 +++-- tools/wrc/parser.l | 77 ++++++++++++++++++++-------------------- tools/wrc/parser.y | 96 ++++++++++++++++++++++++-------------------------- tools/wrc/utils.c | 8 ++-- tools/wrc/utils.h | 4 +- tools/wrc/wrc.c | 10 +++-- 7 files changed, 124 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=42418fbbe89f068e254…

1 0

Alexandre Julliard : makefiles: List bison dependencies explicitly for parallel makes, since older bisons don't support --defines.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 145a0ba508487905fcc36ade66175908d615bb75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=145a0ba508487905fcc36ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 21:43:11 2006 +0200 makefiles: List bison dependencies explicitly for parallel makes, since older bisons don't support --defines. --- Make.rules.in | 2 +- dlls/msi/Makefile.in | 2 ++ libs/wpp/Makefile.in | 2 ++ programs/winedbg/Makefile.in | 2 ++ tools/widl/Makefile.in | 2 ++ tools/wmc/Makefile.in | 2 ++ tools/wrc/Makefile.in | 2 ++ 7 files changed, 13 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 2cba40f..cc6d13c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -130,7 +130,7 @@ # Implicit rules $(BISON) $(BISONFLAGS) -o $@ $< .y.tab.h: - $(BISON) $(BISONFLAGS) --defines=$@ -o /dev/null $< + $(BISON) $(BISONFLAGS) -o $*.tab.c -d $< .l.yy.c: $(LEX) $(LEXFLAGS) -t $< >$@ || ($(RM) $@ && exit 1) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 3bd3783..3d8db09 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -58,6 +58,8 @@ RC_BINARIES = \ @MAKE_DLL_RULES@ +sql.tab.c: sql.tab.h # for parallel makes + ### Dependencies: cond.tab.o: cond.tab.c diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index ff6744c..246fb36 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -20,6 +20,8 @@ all: $(MODULE) $(AR) $@ $(OBJS) $(RANLIB) $@ +ppy.tab.c: ppy.tab.h # for parallel makes + ### Dependencies: ppy.tab.o: ppy.tab.c diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 35a96d0..45829ad 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -43,6 +43,8 @@ install:: $(MANPAGES) $(DESTDIR)$(mandir uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) +dbg.tab.c: dbg.tab.h # for parallel makes + ### Dependencies: dbg.tab.o: dbg.tab.c diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index a2afefc..86fa6fb 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -39,6 +39,8 @@ install:: $(PROGRAMS) $(MANPAGES) $(INST uninstall:: $(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) +parser.tab.c: parser.tab.h # for parallel makes + ### Dependencies: parser.tab.o: parser.tab.c diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a9b05b8..e762742 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -33,6 +33,8 @@ install:: $(PROGRAMS) $(MANPAGES) $(INST uninstall:: $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) +mcy.tab.c: mcy.tab.h # for parallel makes + ### Dependencies: mcy.tab.o: mcy.tab.c diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 382f089..1133840 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -38,6 +38,8 @@ install:: $(PROGRAMS) $(MANPAGES) $(INST uninstall:: $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) +parser.tab.c: parser.tab.h # for parallel makes + ### Dependencies: parser.tab.o: parser.tab.c

1 0

Alexandre Julliard : Make.rules: Set the default prefix for bison files from the file basename.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: bcdc5fb55f51e6708185b1e0d223c6b5a41c2138 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcdc5fb55f51e6708185b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 21:47:49 2006 +0200 Make.rules: Set the default prefix for bison files from the file basename. --- Make.rules.in | 4 ++-- programs/winedbg/dbg.y | 2 ++ tools/widl/parser.y | 2 ++ tools/wmc/mcy.y | 1 + tools/wrc/parser.y | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index cc6d13c..894c377 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -127,10 +127,10 @@ # Implicit rules $(AS) -o $@ $< .y.tab.c: - $(BISON) $(BISONFLAGS) -o $@ $< + $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< .y.tab.h: - $(BISON) $(BISONFLAGS) -o $*.tab.c -d $< + $(BISON) $(BISONFLAGS) -p $*_ -o $*.tab.c -d $< .l.yy.c: $(LEX) $(LEXFLAGS) -t $< >$@ || ($(RM) $@ && exit 1) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index b7d83d8..56efb94 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -40,6 +40,8 @@ int yyerror(const char*); %} +%name-prefix="yy" + %union { struct dbg_lvalue lvalue; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 63e4c6d..922df4d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -126,6 +126,8 @@ #define tsUNION 3 unsigned int num; } +%name-prefix="yy" + %token <str> aIDENTIFIER %token <str> aKNOWNTYPE %token <num> aNUM aHEXNUM diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 32458be..abe5d02 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -95,6 +95,7 @@ static cp_xlat_t *find_cpxlat(int lan); %} +%name-prefix="yy" %union { WCHAR *str; diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index bc7409e..4297a19 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -282,6 +282,8 @@ static int rsrcid_to_token(int lookahead ani_any_t *ani; } +%name-prefix="yy" + %token tNL %token <num> tNUMBER tLNUMBER %token <str> tSTRING tIDENT tFILENAME

1 0

Alexandre Julliard : msi: Change the prefix on bison-generated names to avoid the name-prefix directive .
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 2d1b6182aff44a1ba3a4cc4acb939e54b73975a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d1b6182aff44a1ba3a4cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 21:53:04 2006 +0200 msi: Change the prefix on bison-generated names to avoid the name-prefix directive. --- dlls/msi/cond.y | 11 +++++------ dlls/msi/sql.y | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 26d0ecb..dd8252a 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -40,7 +40,7 @@ #include "action.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info -static int COND_error(const char *str); +static int cond_error(const char *str); WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -59,7 +59,7 @@ struct cond_str { static LPWSTR COND_GetString( struct cond_str *str ); static LPWSTR COND_GetLiteral( struct cond_str *str ); -static int COND_lex( void *COND_lval, COND_input *info); +static int cond_lex( void *COND_lval, COND_input *info); static const WCHAR szEmpty[] = { 0 }; static INT compare_int( INT a, INT operator, INT b ); @@ -102,7 +102,6 @@ static BOOL num_from_prop( LPCWSTR p, IN %} %pure-parser -%name-prefix="COND_" %union { @@ -668,7 +667,7 @@ static int COND_GetOne( struct cond_str return rc; } -static int COND_lex( void *COND_lval, COND_input *cond ) +static int cond_lex( void *COND_lval, COND_input *cond ) { int rc; struct cond_str *str = COND_lval; @@ -708,7 +707,7 @@ static LPWSTR COND_GetLiteral( struct co return ret; } -static int COND_error(const char *str) +static int cond_error(const char *str) { TRACE("%s\n", str ); return 0; @@ -729,7 +728,7 @@ MSICONDITION MSI_EvaluateConditionW( MSI cond.n = 0; cond.result = MSICONDITION_ERROR; - if ( !COND_parse( &cond ) ) + if ( !cond_parse( &cond ) ) r = cond.result; else r = MSICONDITION_ERROR; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 5d5a904..abffb2f 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -36,7 +36,7 @@ #include "wine/debug.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info -extern int SQL_error(const char *str); +static int sql_error(const char *str); WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -51,7 +51,7 @@ typedef struct tag_SQL_input static LPWSTR SQL_getstring( void *info, struct sql_str *str ); static INT SQL_getint( void *info ); -static int SQL_lex( void *SQL_lval, SQL_input *info ); +static int sql_lex( void *SQL_lval, SQL_input *info ); static void *parser_alloc( void *info, unsigned int sz ); static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ); @@ -67,7 +67,6 @@ static struct expr * EXPR_wildcard( void %} %pure-parser -%name-prefix="SQL_" %union { @@ -687,7 +686,7 @@ static column_info *parser_alloc_column( return col; } -int SQL_lex( void *SQL_lval, SQL_input *sql ) +static int sql_lex( void *SQL_lval, SQL_input *sql ) { int token; struct sql_str * str = SQL_lval; @@ -753,7 +752,7 @@ INT SQL_getint( void *info ) return r; } -int SQL_error( const char *str ) +static int sql_error( const char *str ) { return 0; } @@ -852,7 +851,7 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCW sql.view = phview; sql.mem = mem; - r = SQL_parse(&sql); + r = sql_parse(&sql); TRACE("Parse returned %d\n", r); if( r )

1 0

Alexandre Julliard : winedbg: Change the prefix on bison-generated names to avoid the name-prefix directive .
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 1be6e9a6b1dc3007a66e4fe69b693774e9859298 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1be6e9a6b1dc3007a66e4fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:04:43 2006 +0200 winedbg: Change the prefix on bison-generated names to avoid the name-prefix directive. --- programs/winedbg/dbg.y | 10 ++++------ programs/winedbg/debug.l | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 56efb94..ea28b54 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -35,13 +35,11 @@ #include "debugger.h" #include "wine/exception.h" #include "expr.h" -int yylex(void); -int yyerror(const char*); +int dbg_lex(void); +static int dbg_error(const char*); %} -%name-prefix="yy" - %union { struct dbg_lvalue lvalue; @@ -530,7 +528,7 @@ void parser_handle(HANDLE input) __TRY { ret_ok = TRUE; - yyparse(); + dbg_parse(); } __EXCEPT(wine_dbg_cmd) { @@ -554,7 +552,7 @@ void parser(const char* filename) } } -int yyerror(const char* s) +int dbg_error(const char* s) { dbg_printf("%s\n", s); return 0; diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 9fef183..451c96d 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option nounput interactive 8bit +%option nounput interactive 8bit prefix="dbg_" %{ #include <stdlib.h> @@ -104,7 +104,7 @@ STRING \"[^\n"]+\" /* This rule must precede the ones below, */ /* otherwise paths like '/' or '0x9' would */ /* get parsed as an operator or tNUM */ -<PATH_EXPECTED>{PATHNAME} { yylval.string = lexeme_alloc(yytext); return tPATH; } +<PATH_EXPECTED>{PATHNAME} { dbg_lval.string = lexeme_alloc(yytext); return tPATH; } "||" { return OP_LOR; } "&&" { return OP_LAND; } @@ -120,19 +120,19 @@ STRING \"[^\n"]+\" "[" { return *yytext; } "]" { return *yytext; } -"0x"{HEXDIGIT}+ { sscanf(yytext, "%x", &yylval.integer); return tNUM; } -{DIGIT}+ { sscanf(yytext, "%d", &yylval.integer); return tNUM; } +"0x"{HEXDIGIT}+ { sscanf(yytext, "%x", &dbg_lval.integer); return tNUM; } +{DIGIT}+ { sscanf(yytext, "%d", &dbg_lval.integer); return tNUM; } <FORMAT_EXPECTED>"/"{DIGIT}+{FORMAT} { char* last; - yylval.integer = strtol(yytext+1, &last, 0) << 8; - yylval.integer |= *last; + dbg_lval.integer = strtol(yytext+1, &last, 0) << 8; + dbg_lval.integer |= *last; return tFORMAT; } -<FORMAT_EXPECTED>"/"{FORMAT} { yylval.integer = (1 << 8) | yytext[1]; return tFORMAT; } +<FORMAT_EXPECTED>"/"{FORMAT} { dbg_lval.integer = (1 << 8) | yytext[1]; return tFORMAT; } -{STRING} { yylval.string = lexeme_alloc(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; return tSTRING; } +{STRING} { dbg_lval.string = lexeme_alloc(yytext + 1); dbg_lval.string[strlen(dbg_lval.string) - 1] = '\0'; return tSTRING; } <ASTRING_EXPECTED>[^\n]+ { char* p = yytext; while (*p == ' ' || *p == '\t') p++; - yylval.string = lexeme_alloc(p); return tSTRING; } + dbg_lval.string = lexeme_alloc(p); return tSTRING; } <INITIAL,NOPROCESS>info|inf|in { BEGIN(INFO_CMD); return tINFO; } <INITIAL>up { BEGIN(NOCMD); return tUP; } @@ -214,8 +214,8 @@ union { return tUNION; } enum { return tENUM; } all { return tALL; } -{IDENTIFIER} { yylval.string = lexeme_alloc(yytext); return tIDENTIFIER; } -"$"{IDENTIFIER} { yylval.string = lexeme_alloc(yytext+1); return tINTVAR; } +{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext); return tIDENTIFIER; } +"$"{IDENTIFIER} { dbg_lval.string = lexeme_alloc(yytext+1); return tINTVAR; } <*>[ \t\r]+ /* Eat up whitespace and DOS LF */ @@ -223,8 +223,8 @@ all <*>. { if (syntax_error == 0) { syntax_error++; dbg_printf("Syntax Error (%s)\n", yytext); } } %% -#ifndef yywrap -int yywrap(void) { return 1; } +#ifndef dbg_wrap +int dbg_wrap(void) { return 1; } #endif static char** local_lexemes /* = NULL */;

1 0

Byeong-Sik Jeon : gdi32: Fix DefaultGuiFont name string for Korean Charset.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 95226bf25ddab61d58b5ca205c54bb036648671e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95226bf25ddab61d58b5ca2… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Tue Aug 29 15:21:48 2006 +0900 gdi32: Fix DefaultGuiFont name string for Korean Charset. --- dlls/gdi/gdiobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi/gdiobj.c index 24c20fc..3d5450d 100644 --- a/dlls/gdi/gdiobj.c +++ b/dlls/gdi/gdiobj.c @@ -393,7 +393,7 @@ static const struct DefaultFontInfo defa { /* DefaultGuiFont */ 9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'G','u','l','i','m','\0'}, + {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, { CHINESEBIG5_CHARSET, @@ -437,7 +437,7 @@ static const struct DefaultFontInfo defa { /* DefaultGuiFont */ 8, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','M','i','n','g','l','i','u','\0'} /* FIXME: Is this correct? */ + {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, };

1 0

Byeong-Sik Jeon : gdi32: Fix logical error of italic, bold determination.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 4d619723a1b4ab7bc64d9b5c0da05105228a3290 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d619723a1b4ab7bc64d9b5… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Tue Aug 29 15:21:52 2006 +0900 gdi32: Fix logical error of italic, bold determination. --- dlls/gdi/freetype.c | 79 +++++++++++++++++++++------------------------------ 1 files changed, 32 insertions(+), 47 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 1278b6a..a664db9 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -2242,10 +2242,11 @@ static BOOL create_child_font_list(GdiFo GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont) { GdiFont ret; - Face *face, *best; + Face *face, *best, *best_bitmap; Family *family, *last_resort_family; struct list *family_elem_ptr, *face_elem_ptr; INT height, width = 0; + unsigned int score = 0, new_score; signed int diff = 0, newdiff; BOOL bd, it, can_use_bitmap; LOGFONTW lf; @@ -2432,57 +2433,41 @@ found: height = GDI_ROUND( (FLOAT)lf.lfHeight * dc->xformWorld2Vport.eM22 ); height = lf.lfHeight < 0 ? -abs(height) : abs(height); - face = best = NULL; - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(!(face->Italic ^ it) && !(face->Bold ^ bd) && - ((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0])) { - if(face->scalable) - break; - if(height > 0) - newdiff = height - (signed int)(face->size.height); - else - newdiff = -height - ((signed int)(face->size.height) - face->size.internal_leading); - if(!best || (diff > 0 && newdiff < diff && newdiff >= 0) || - (diff < 0 && newdiff > diff)) { - TRACE("%d is better for %d diff was %d\n", face->size.height, height, diff); - diff = newdiff; + face = best = best_bitmap = NULL; + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + if((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0]) + { + new_score = (face->Italic ^ it) + (face->Bold ^ bd); + if(!best || new_score <= score) + { + TRACE("(it=%d, bd=%d) is selected for (it=%d, bd=%d)\n", + face->Italic, face->Bold, it, bd); + score = new_score; best = face; - if(diff == 0) - break; - } - } - face = NULL; - } - if(!face && best) - face = best; - else if(!face) { - best = NULL; - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - if((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0]) { - if(face->scalable) - break; - if(height > 0) - newdiff = height - (signed int)(face->size.height); - else - newdiff = -height - ((signed int)(face->size.height) - face->size.internal_leading); - if(!best || (diff > 0 && newdiff < diff && newdiff >= 0) || - (diff < 0 && newdiff > diff)) { - TRACE("%d is better for %d diff was %d\n", face->size.height, height, diff); - diff = newdiff; - best = face; - if(diff == 0) - break; + if(best->scalable && score == 0) break; + if(!best->scalable) + { + if(height > 0) + newdiff = height - (signed int)(best->size.height); + else + newdiff = -height - ((signed int)(best->size.height) - best->size.internal_leading); + if(!best_bitmap || new_score < score || + (diff > 0 && newdiff < diff && newdiff >= 0) || (diff < 0 && newdiff > diff)) + { + TRACE("%d is better for %d diff was %d\n", best->size.height, height, diff); + diff = newdiff; + best_bitmap = best; + if(score == 0 && diff == 0) break; + } } } - face = NULL; } - if(!face && best) - face = best; - if(it && !face->Italic) ret->fake_italic = TRUE; - if(bd && !face->Bold) ret->fake_bold = TRUE; } + if(best) + face = best->scalable ? best : best_bitmap; + ret->fake_italic = (it && !face->Italic); + ret->fake_bold = (bd && !face->Bold); memcpy(&ret->fs, &face->fs, sizeof(FONTSIGNATURE));

1 0

Detlef Riekenberg : localspl: Add minimal localspl.dll.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 2198d83622a529495097d8e7b0a9458d295ea0a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2198d83622a529495097d8e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 11 00:28:36 2006 +0200 localspl: Add minimal localspl.dll. --- configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/localspl/Makefile.in | 13 ++++++++ dlls/localspl/localspl.spec | 64 +++++++++++++++++++++++++++++++++++++ dlls/localspl/localspl_main.c | 71 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 152 insertions(+), 1 deletions(-) create mode 100644 dlls/localspl/Makefile.in create mode 100644 dlls/localspl/localspl.spec create mode 100644 dlls/localspl/localspl_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2198d83622a52949509…

1 0

Vitaliy Margolen : dinput: Move hook_thread from device to DirectInput.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 722a686d66cc7f3e04a86e1cc167cb3e0154c70a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=722a686d66cc7f3e04a86e1… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Sep 10 16:47:39 2006 -0600 dinput: Move hook_thread from device to DirectInput. --- dlls/dinput/device.c | 136 ------------------------------------------ dlls/dinput/device_private.h | 2 - dlls/dinput/dinput_main.c | 136 ++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/dinput_private.h | 2 + 4 files changed, 138 insertions(+), 138 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 13141c2..0c5564c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -901,139 +901,3 @@ HRESULT WINAPI IDirectInputDevice8WImpl_ return DI_OK; } - -/****************************************************************************** - * DInput hook thread - */ - -static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - static HHOOK kbd_hook, mouse_hook; - BOOL res; - - TRACE("got message %x %p %p\n", message, (LPVOID)wParam, (LPVOID)lParam); - switch (message) - { - case WM_USER+0x10: - if (wParam == WH_KEYBOARD_LL) - { - if (lParam) - { - if (kbd_hook) return 0; - kbd_hook = SetWindowsHookExW(WH_KEYBOARD_LL, (LPVOID)lParam, DINPUT_instance, 0); - return (LRESULT)kbd_hook; - } - else - { - if (!kbd_hook) return 0; - res = UnhookWindowsHookEx(kbd_hook); - kbd_hook = NULL; - return res; - } - } - else if (wParam == WH_MOUSE_LL) - { - if (lParam) - { - if (mouse_hook) return 0; - mouse_hook = SetWindowsHookExW(WH_MOUSE_LL, (LPVOID)lParam, DINPUT_instance, 0); - return (LRESULT)mouse_hook; - } - else - { - if (!mouse_hook) return 0; - res = UnhookWindowsHookEx(mouse_hook); - mouse_hook = NULL; - return res; - } - } - return 0; - - case WM_DESTROY: - PostQuitMessage(0); - } - return DefWindowProcW(hWnd, message, wParam, lParam); -} - -static HANDLE signal_event; - -static DWORD WINAPI hook_thread_proc(void *param) -{ - static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0}; - MSG msg; - WNDCLASSEXW wcex; - HWND hwnd; - - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - wcex.lpfnWndProc = dinput_hook_WndProc; - wcex.lpszClassName = classW; - wcex.hInstance = GetModuleHandleW(0); - - if (!RegisterClassExW(&wcex)) ERR("Error registering window class\n"); - hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0); - *(HWND*)param = hwnd; - - SetEvent(signal_event); - if (hwnd) - { - while (GetMessageW(&msg, 0, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - } - else ERR("Error creating message window\n"); - - DestroyWindow(hwnd); - UnregisterClassW(wcex.lpszClassName, wcex.hInstance); - return 0; -} - -static CRITICAL_SECTION dinput_hook_crit; -static CRITICAL_SECTION_DEBUG dinput_critsect_debug = -{ - 0, 0, &dinput_hook_crit, - { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } -}; -static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; - -static HWND get_thread_hwnd(void) -{ - static HANDLE hook_thread; - static HWND hook_thread_hwnd; - - EnterCriticalSection(&dinput_hook_crit); - if (!hook_thread) - { - DWORD tid; - HWND hwnd; - - signal_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &hwnd, 0, &tid); - if (signal_event && hook_thread) - { - HANDLE handles[2]; - handles[0] = signal_event; - handles[1] = hook_thread; - WaitForMultipleObjects(2, handles, FALSE, INFINITE); - } - CloseHandle(signal_event); - - if (!(hook_thread_hwnd = hwnd)) - { - /* Thread failed to create window - reset things so we could try again later */ - CloseHandle(hook_thread); - hook_thread = 0; - } - } - LeaveCriticalSection(&dinput_hook_crit); - - return hook_thread_hwnd; -} - -HHOOK set_dinput_hook(int hook_id, LPVOID proc) -{ - return (HHOOK)SendMessageW(get_thread_hwnd(), WM_USER+0x10, (WPARAM)hook_id, (LPARAM)proc); -} diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 8ccd0ab..a2777c2 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -52,8 +52,6 @@ extern void fill_DataFormat(void *out, c extern DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) ; extern void release_DataFormat(DataFormat *df) ; -extern HHOOK set_dinput_hook(int hook_id, LPVOID proc); - /* Used to fill events in the queue */ #define GEN_EVENT(offset,data,xtime,seq) \ { \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index cef61b7..2a05347 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -686,3 +686,139 @@ HRESULT WINAPI DllGetClassObject(REFCLSI FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } + +/****************************************************************************** + * DInput hook thread + */ + +static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static HHOOK kbd_hook, mouse_hook; + BOOL res; + + TRACE("got message %x %p %p\n", message, (LPVOID)wParam, (LPVOID)lParam); + switch (message) + { + case WM_USER+0x10: + if (wParam == WH_KEYBOARD_LL) + { + if (lParam) + { + if (kbd_hook) return 0; + kbd_hook = SetWindowsHookExW(WH_KEYBOARD_LL, (LPVOID)lParam, DINPUT_instance, 0); + return (LRESULT)kbd_hook; + } + else + { + if (!kbd_hook) return 0; + res = UnhookWindowsHookEx(kbd_hook); + kbd_hook = NULL; + return res; + } + } + else if (wParam == WH_MOUSE_LL) + { + if (lParam) + { + if (mouse_hook) return 0; + mouse_hook = SetWindowsHookExW(WH_MOUSE_LL, (LPVOID)lParam, DINPUT_instance, 0); + return (LRESULT)mouse_hook; + } + else + { + if (!mouse_hook) return 0; + res = UnhookWindowsHookEx(mouse_hook); + mouse_hook = NULL; + return res; + } + } + return 0; + + case WM_DESTROY: + PostQuitMessage(0); + } + return DefWindowProcW(hWnd, message, wParam, lParam); +} + +static HANDLE signal_event; + +static DWORD WINAPI hook_thread_proc(void *param) +{ + static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0}; + MSG msg; + WNDCLASSEXW wcex; + HWND hwnd; + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + wcex.lpfnWndProc = dinput_hook_WndProc; + wcex.lpszClassName = classW; + wcex.hInstance = GetModuleHandleW(0); + + if (!RegisterClassExW(&wcex)) ERR("Error registering window class\n"); + hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0); + *(HWND*)param = hwnd; + + SetEvent(signal_event); + if (hwnd) + { + while (GetMessageW(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + else ERR("Error creating message window\n"); + + DestroyWindow(hwnd); + UnregisterClassW(wcex.lpszClassName, wcex.hInstance); + return 0; +} + +static CRITICAL_SECTION dinput_hook_crit; +static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +{ + 0, 0, &dinput_hook_crit, + { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } +}; +static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + +static HWND get_thread_hwnd(void) +{ + static HANDLE hook_thread; + static HWND hook_thread_hwnd; + + EnterCriticalSection(&dinput_hook_crit); + if (!hook_thread) + { + DWORD tid; + HWND hwnd; + + signal_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, &hwnd, 0, &tid); + if (signal_event && hook_thread) + { + HANDLE handles[2]; + handles[0] = signal_event; + handles[1] = hook_thread; + WaitForMultipleObjects(2, handles, FALSE, INFINITE); + } + CloseHandle(signal_event); + + if (!(hook_thread_hwnd = hwnd)) + { + /* Thread failed to create window - reset things so we could try again later */ + CloseHandle(hook_thread); + hook_thread = 0; + } + } + LeaveCriticalSection(&dinput_hook_crit); + + return hook_thread_hwnd; +} + +HHOOK set_dinput_hook(int hook_id, LPVOID proc) +{ + return (HHOOK)SendMessageW(get_thread_hwnd(), WM_USER+0x10, (WPARAM)hook_id, (LPARAM)proc); +} diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index c23b048..d3f58a3 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -54,4 +54,6 @@ extern const struct dinput_device joysti extern HINSTANCE DINPUT_instance; +extern HHOOK set_dinput_hook(int hook_id, LPVOID proc); + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */

1 0