wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Alexander Dorofeyev : wined3d: Fix resultarg state handling in nvrc/ nvts code.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: a14793f50ba3acb0b99bb166b8534b255ff09ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14793f50ba3acb0b99bb166b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Nov 2 08:14:46 2013 +0200 wined3d: Fix resultarg state handling in nvrc/nvts code. Resultarg affects both rgb and alpha register combiner output. Ensure that changing resultarg updates both. --- dlls/wined3d/nvidia_texture_shader.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a14793f50ba3acb0b99bb…

1 0

Alexandre Julliard : widl: Add support for #pragma directives.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: cc02e15220cdf082b3fc19e585f7bab11e523198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc02e15220cdf082b3fc19e58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 14:13:06 2013 +0100 widl: Add support for #pragma directives. --- tools/widl/header.c | 3 +++ tools/widl/parser.l | 4 ++++ tools/widl/parser.y | 11 ++++++++++- tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 1 + 5 files changed, 19 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 2f275c7..bd9f21c 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1342,6 +1342,7 @@ static void write_imports(FILE *header, const statement_list_t *stmts) case STMT_TYPEDEF: case STMT_MODULE: case STMT_CPPQUOTE: + case STMT_PRAGMA: case STMT_DECLARATION: /* not processed here */ break; @@ -1376,6 +1377,7 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) case STMT_TYPEDEF: case STMT_MODULE: case STMT_CPPQUOTE: + case STMT_PRAGMA: case STMT_DECLARATION: /* not processed here */ break; @@ -1428,6 +1430,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons break; case STMT_IMPORTLIB: case STMT_MODULE: + case STMT_PRAGMA: /* not included in header */ break; case STMT_IMPORT: diff --git a/tools/widl/parser.l b/tools/widl/parser.l index fb61e21..b911186 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -37,6 +37,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* %x WSTRQUOTE %x ATTR %x PP_LINE +%x PP_PRAGMA %x SQUOTE %{ @@ -125,6 +126,7 @@ UUID *parse_uuid(const char *u) ************************************************************************** */ %% +<INITIAL>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(PP_PRAGMA); <INITIAL,ATTR>^{ws}*\#{ws}* yy_push_state(PP_LINE); <PP_LINE>[^\n]* { int lineno; @@ -144,6 +146,8 @@ UUID *parse_uuid(const char *u) line_number = lineno - 1; /* We didn't read the newline */ input_name = xstrdup(fname); } +<PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; +<PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 97c3896..946d165 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -114,6 +114,7 @@ static statement_t *make_statement_type_decl(type_t *type); static statement_t *make_statement_reference(type_t *type); static statement_t *make_statement_declaration(var_t *var); static statement_t *make_statement_library(typelib_t *typelib); +static statement_t *make_statement_pragma(const char *str); static statement_t *make_statement_cppquote(const char *str); static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); @@ -152,7 +153,7 @@ static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); enum storage_class stgclass; } -%token <str> aIDENTIFIER +%token <str> aIDENTIFIER aPRAGMA %token <str> aKNOWNTYPE %token <num> aNUM aHEXNUM %token <dbl> aDOUBLE @@ -363,6 +364,7 @@ statement: | declaration ';' { $$ = make_statement_declaration($1); } | import { $$ = make_statement_import($1); } | typedef ';' { $$ = $1; } + | aPRAGMA { $$ = make_statement_pragma($1); } ; typedecl: @@ -2744,6 +2746,13 @@ static statement_t *make_statement_library(typelib_t *typelib) return stmt; } +static statement_t *make_statement_pragma(const char *str) +{ + statement_t *stmt = make_statement(STMT_PRAGMA); + stmt->u.str = str; + return stmt; +} + static statement_t *make_statement_cppquote(const char *str) { statement_t *stmt = make_statement(STMT_CPPQUOTE); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index efde0b0..30b6560 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -243,6 +243,7 @@ enum statement_type STMT_TYPEDEF, STMT_IMPORT, STMT_IMPORTLIB, + STMT_PRAGMA, STMT_CPPQUOTE }; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index dd98486..6eb229a 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2266,6 +2266,7 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) switch(stmt->type) { case STMT_LIBRARY: case STMT_IMPORT: + case STMT_PRAGMA: case STMT_CPPQUOTE: case STMT_DECLARATION: /* not included in typelib */

1 0

Alexandre Julliard : makedep: Add per-file flag to store the information about files to generate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 1f3e3fa4248ec59a6cca612dda248cb37854119f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3e3fa4248ec59a6cca612dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 17:39:30 2013 +0100 makedep: Add per-file flag to store the information about files to generate. --- tools/makedep.c | 164 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 91 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3e3fa4248ec59a6cca6…

1 0

Nikolay Sivov : shlwapi: Implement PathUnExpandEnvStrings.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 7513b58329c5decd8b6502f579c9772f1e214ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7513b58329c5decd8b6502f57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 13:39:09 2013 +0400 shlwapi: Implement PathUnExpandEnvStrings. --- dlls/shlwapi/path.c | 117 +++++++++++++++++++++++++++++++++++--- dlls/shlwapi/tests/path.c | 136 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 243 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7513b58329c5decd8b650…

1 0

Andrey Zhezherun : msvcp: Added missing casts to unsigned char in streambuf functions.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: c1a5b06d49e5e39c649b5f9aa231ad4c89aae54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a5b06d49e5e39c649b5f9aa… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:38:29 2013 +0000 msvcp: Added missing casts to unsigned char in streambuf functions. --- dlls/msvcp100/ios.c | 2 +- dlls/msvcp60/ios.c | 6 +++--- dlls/msvcp71/ios.c | 6 +++--- dlls/msvcp80/ios.c | 6 +++--- dlls/msvcp90/ios.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index c5cc200..8ebdb6a 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -978,7 +978,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index aa024bf..693c376 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1409,7 +1409,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3447,7 +3447,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3484,7 +3484,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@MAEHH@Z */ diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 9bf86af..b651099 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -1451,7 +1451,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3697,7 +3697,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3734,7 +3734,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@MAEHH@Z */ diff --git a/dlls/msvcp80/ios.c b/dlls/msvcp80/ios.c index 9cdaf1d..3fe65bd 100644 --- a/dlls/msvcp80/ios.c +++ b/dlls/msvcp80/ios.c @@ -1406,7 +1406,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3702,7 +3702,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3739,7 +3739,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@MAEHH@Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 71e92f3..90a051c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1406,7 +1406,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3702,7 +3702,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3739,7 +3739,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@MAEHH@Z */

1 0

Andrey Zhezherun : msvcp: Fixed char_traits<char>::to_int_type.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 43d31483572dd5d17f3fa300738c813ef169a8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d31483572dd5d17f3fa3007… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:35:21 2013 +0000 msvcp: Fixed char_traits<char>::to_int_type. --- dlls/msvcp71/string.c | 2 +- dlls/msvcp90/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 534d7e7..f4e96ef 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits@D@std@@SAHAEBD@Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits@D@std@@SA_NABH0@Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 0772ade..055150c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits@D@std@@SAHAEBD@Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits@D@std@@SA_NABH0@Z */

1 0

Aric Stewart : usp10: Implement resolveResolved (L1) for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 9ccfebd6155af026572beaabb172345793aadc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccfebd6155af026572beaabb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:01:05 2013 -0500 usp10: Implement resolveResolved (L1) for Unicode 6.3. --- dlls/usp10/bidi.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 242ad91..ceb498e 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -793,6 +793,37 @@ static void resolveImplicit(const WORD * pcls, WORD *plevel, int sos, int eos) } } +static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, int sos, int eos) +{ + int i; + + /* L1 */ + for (i = sos; i <= eos; i++) + { + if (pcls[i] == B || pcls[i] == S) + { + int j = i -1; + while (i > sos && j >= sos && + (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + plevel[i] = baselevel; + } + if (i == eos && + (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || + pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || + pcls[i] == RLO || pcls[i] == PDF || pcls[i] == BN )) + { + int j = i; + while (j >= sos && (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + } + } +} + static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) { int run_start, run_end, i; @@ -972,6 +1003,10 @@ BOOL BIDI_DetermineLevels( /* resolveImplicit */ resolveImplicit(chartype, lpOutLevels, 0, uCount-1); + /* resolveResolvedLevels*/ + classify(lpString, chartype, uCount, c); + resolveResolved(baselevel, chartype, lpOutLevels, 0, uCount-1); + HeapFree(GetProcessHeap(), 0, chartype); return TRUE; }

1 0

Aric Stewart : usp10: Rewrite resolveNeutral and resolveImplicit for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: de5dc96f85449ed3a9d58957e9401ea37bbf7613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5dc96f85449ed3a9d58957e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:00:54 2013 -0500 usp10: Rewrite resolveNeutral and resolveImplicit for Unicode 6.3. --- dlls/usp10/bidi.c | 269 ++++++++++++++++++----------------------------------- 1 files changed, 91 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de5dc96f85449ed3a9d58…

1 0

Aric Stewart : usp10: Rewrite resolveWeak for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: c7677336317560d5b91e22c3d345672e19887ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7677336317560d5b91e22c3d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:00:37 2013 -0500 usp10: Rewrite resolveWeak for Unicode 6.3. --- dlls/usp10/bidi.c | 515 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 309 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7677336317560d5b91e2…

1 0

Aric Stewart : usp10: Rewrite resolveExplicit for Unicode 6.3.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 2531d40b51ce3fbb9a73e5043affd3684e106f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2531d40b51ce3fbb9a73e5043… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:00:24 2013 -0500 usp10: Rewrite resolveExplicit for Unicode 6.3. --- dlls/usp10/bidi.c | 338 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 254 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2531d40b51ce3fbb9a73e…

1 0

← Newer
1
...
49
50
51
52
53
54
55
56
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013