wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 710df5fcf1292534174d8b320268c142a074574d URL: http://source.winehq.org/git/wine.git/?a=commit;h=710df5fcf1292534174d8b320… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 2 23:43:14 2014 +0900 po: Update Japanese translation. --- po/ja.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0c4a284..fe43416 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-08-06 00:34+0900\n" +"PO-Revision-Date: 2014-10-02 23:14+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -3532,16 +3532,12 @@ msgid "Expected ')'" msgstr "')'を期待していました" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "サブジェクトキー識別子" +msgstr "識別子を期待していました" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';'を期待していました" +msgstr "'='を期待していました" #: jscript.rc:42 msgid "Invalid character" @@ -3572,20 +3568,16 @@ msgid "Label not found" msgstr "ラベルが見つかりません" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';'を期待していました" +msgstr "'@end'を期待していました" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "条件コンパイルはオフにされています" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';'を期待していました" +msgstr "'@'を期待していました" #: jscript.rc:54 msgid "Number expected"

1 0

Jacek Caban : jscript: Added support for relational CC expressions.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: e7b8459bc334f47824a4739926734bebd0425b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b8459bc334f47824a473992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:40 2014 +0200 jscript: Added support for relational CC expressions. --- dlls/jscript/cc_parser.y | 8 ++++---- dlls/jscript/tests/cc.js | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index b22aef8..18c1cb1 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -192,13 +192,13 @@ CCEqualityExpression CCRelationalExpression : CCShiftExpression { $$ = $1; } | CCRelationalExpression '<' CCShiftExpression - { FIXME("'<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) < get_ccnum($3)); } | CCRelationalExpression tLEQ CCShiftExpression - { FIXME("'<=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) <= get_ccnum($3)); } | CCRelationalExpression '>' CCShiftExpression - { FIXME("'>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) > get_ccnum($3)); } | CCRelationalExpression tGEQ CCShiftExpression - { FIXME("'>=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) >= get_ccnum($3)); } CCShiftExpression : CCAdditiveExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 09ef285..8f45a3d 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -152,8 +152,33 @@ ok(@test === true, "@test = " + @test); @set @test = (1==false+1) ok(@test === true, "@test = " + @test); -@set @test = (1+true==false+1) -ok(@test === false, "@test = " + @test); +function expect(val, exval) { + ok(val === exval, "got " + val + " expected " + exval); +} + +@set @test = (false < 0.5) +expect(@test, true); + +@set @test = (true == 0 < 0.5) +expect(@test, true); + +@set @test = (false < 0) +expect(@test, false); + +@set @test = (false > 0.5) +expect(@test, false); + +@set @test = (1 < true) +expect(@test, false); + +@set @test = (1 <= true) +expect(@test, true); + +@set @test = (1 >= true) +expect(@test, true); + +@set @test = (1 >= true-1) +expect(@test, true); @if (false) this wouldn not parse

1 0

Jacek Caban : jscript: Added support for '==' CC expression.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: d9e8c013c6346a0fec875fdd51b5a85b47191713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e8c013c6346a0fec875fdd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:35 2014 +0200 jscript: Added support for '==' CC expression. --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 34ee90c..b22aef8 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -181,7 +181,7 @@ CCBitwiseANDExpression CCEqualityExpression : CCRelationalExpression { $$ = $1; } | CCEqualityExpression tEQ CCRelationalExpression - { FIXME("'==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) == get_ccnum($3)); } | CCEqualityExpression tNEQ CCRelationalExpression { $$ = ccval_bool(get_ccnum($1) != get_ccnum($3)); } | CCEqualityExpression tEQEQ CCRelationalExpression diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 7ce3682..09ef285 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -146,6 +146,15 @@ ok(@test === -1, "@test = " + @test); @set @test = (true-@_jscript) ok(@test === 0, "@test = " + @test); +@set @test = (true==1) +ok(@test === true, "@test = " + @test); + +@set @test = (1==false+1) +ok(@test === true, "@test = " + @test); + +@set @test = (1+true==false+1) +ok(@test === false, "@test = " + @test); + @if (false) this wouldn not parse "@end

1 0

Jacek Caban : jscript: Added parser rules for missing expressions.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: a0f038963b02ca2b458326c13c07228a54a5d514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f038963b02ca2b458326c13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:29 2014 +0200 jscript: Added parser rules for missing expressions. --- dlls/jscript/cc_parser.y | 123 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 116 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index d25022b..34ee90c 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -37,10 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); ccval_t ccval; } -%token tNEQ +%token tEQ tEQEQ tNEQ tNEQEQ tLSHIFT tRSHIFT tRRSHIFT tOR tAND tLEQ tGEQ %token <ccval> tCCValue -%type <ccval> CCUnaryExpression CCEqualityExpression CCAdditiveExpression CCMultiplicativeExpression +%type <ccval> CCUnaryExpression CCLogicalORExpression CCLogicalANDExpression +%type <ccval> CCBitwiseORExpression CCBitwiseXORExpression CCBitwiseANDExpression +%type <ccval> CCEqualityExpression CCRelationalExpression CCShiftExpression CCAdditiveExpression CCMultiplicativeExpression %{ @@ -69,14 +71,65 @@ static int cc_parser_lex(void *lval, parser_ctx_t *ctx) case '-': case '*': case '/': + case '~': + case '%': + case '^': return *ctx->ptr++; + case '=': + if(*++ctx->ptr == '=') { + if(*++ctx->ptr == '=') { + ctx->ptr++; + return tEQEQ; + } + return tEQ; + } + break; case '!': if(*++ctx->ptr == '=') { - ctx->ptr++; + if(*++ctx->ptr == '=') { + ctx->ptr++; + return tNEQEQ; + } return tNEQ; } - return '!'; + case '<': + switch(*++ctx->ptr) { + case '<': + ctx->ptr++; + return tLSHIFT; + case '=': + ctx->ptr++; + return tLEQ; + default: + return '<'; + } + case '>': + switch(*++ctx->ptr) { + case '>': + if(*++ctx->ptr == '>') { + ctx->ptr++; + return tRRSHIFT; + } + return tRSHIFT; + case '=': + ctx->ptr++; + return tGEQ; + default: + return '>'; + } + case '|': + if(*++ctx->ptr == '|') { + ctx->ptr++; + return tOR; + } + return '|'; + case '&': + if(*++ctx->ptr == '&') { + ctx->ptr++; + return tAND; + } + return '&'; } WARN("Failed to interpret %s\n", debugstr_w(ctx->ptr)); @@ -94,13 +147,67 @@ CCExpr CCUnaryExpression : tCCValue { $$ = $1; } - | '(' CCEqualityExpression ')' { $$ = $2; } + | '(' CCLogicalORExpression ')' { $$ = $2; } | '!' CCUnaryExpression { $$ = ccval_bool(!get_ccbool($2)); }; + | '~' CCUnaryExpression { FIXME("'~' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | '+' CCUnaryExpression { FIXME("'+' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | '-' CCUnaryExpression { FIXME("'-' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCLogicalORExpression + : CCLogicalANDExpression { $$ = $1; } + | CCLogicalORExpression tOR CCLogicalANDExpression + { FIXME("'||' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCLogicalANDExpression + : CCBitwiseORExpression { $$ = $1; } + | CCBitwiseANDExpression tAND CCBitwiseORExpression + { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCBitwiseORExpression + : CCBitwiseXORExpression { $$ = $1; } + | CCBitwiseORExpression '|' CCBitwiseXORExpression + { FIXME("'|' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCBitwiseXORExpression + : CCBitwiseANDExpression { $$ = $1; } + | CCBitwiseXORExpression '^' CCBitwiseANDExpression + { FIXME("'^' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCBitwiseANDExpression + : CCEqualityExpression { $$ = $1; } + | CCBitwiseANDExpression '&' CCEqualityExpression + { FIXME("'&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } CCEqualityExpression - : CCAdditiveExpression { $$ = $1; } - | CCEqualityExpression tNEQ CCAdditiveExpression + : CCRelationalExpression { $$ = $1; } + | CCEqualityExpression tEQ CCRelationalExpression + { FIXME("'==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCEqualityExpression tNEQ CCRelationalExpression { $$ = ccval_bool(get_ccnum($1) != get_ccnum($3)); } + | CCEqualityExpression tEQEQ CCRelationalExpression + { FIXME("'===' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCEqualityExpression tNEQEQ CCRelationalExpression + { FIXME("'!==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCRelationalExpression + : CCShiftExpression { $$ = $1; } + | CCRelationalExpression '<' CCShiftExpression + { FIXME("'<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCRelationalExpression tLEQ CCShiftExpression + { FIXME("'<=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCRelationalExpression '>' CCShiftExpression + { FIXME("'>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCRelationalExpression tGEQ CCShiftExpression + { FIXME("'>=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCShiftExpression + : CCAdditiveExpression { $$ = $1; } + | CCShiftExpression tLSHIFT CCAdditiveExpression + { FIXME("'<<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCShiftExpression tRSHIFT CCAdditiveExpression + { FIXME("'>>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCShiftExpression tRRSHIFT CCAdditiveExpression + { FIXME("'>>>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } CCAdditiveExpression : CCMultiplicativeExpression { $$ = $1; } @@ -115,6 +222,8 @@ CCMultiplicativeExpression { $$ = ccval_num(get_ccnum($1) * get_ccnum($3)); } | CCMultiplicativeExpression '/' CCUnaryExpression { $$ = ccval_num(get_ccnum($1) / get_ccnum($3)); } + | CCMultiplicativeExpression '%' CCUnaryExpression + { FIXME("'%%' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } %%

1 0

Hans Leidekker : msi: Include the terminating null in the buffer size for decoded stream names.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: f41ac94e0e2469e520db759835dee68e6bce944e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ac94e0e2469e520db75983… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 2 12:17:34 2014 +0200 msi: Include the terminating null in the buffer size for decoded stream names. --- dlls/msi/database.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b734031..e5ed16e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -131,7 +131,7 @@ UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; IStorage *stg; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index a20f196..b91fe88 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -70,7 +70,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; stream = msi_alloc(sizeof(STREAM)); if (!stream)

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTMLScriptElement inherits from nsIDOMHTMLElement in get_script_guid.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 013b403c5813e5b87e08ff765e7db75c30eb8b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=013b403c5813e5b87e08ff765… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 11:56:18 2014 +0200 mshtml: Don't assume that nsIDOMHTMLScriptElement inherits from nsIDOMHTMLElement in get_script_guid. --- dlls/mshtml/script.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index da6839f..4e79df5 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -849,6 +849,7 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { + nsIDOMHTMLElement *nselem; const PRUnichar *language; nsAString val_str; BOOL ret = FALSE; @@ -872,7 +873,11 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsres = get_elem_attr_value((nsIDOMHTMLElement*)nsscript, languageW, &val_str, &language); + nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMHTMLElement, (void**)&nselem); + assert(nsres == NS_OK); + + nsres = get_elem_attr_value(nselem, languageW, &val_str, &language); + nsIDOMHTMLElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { if(*language) { ret = get_guid_from_language(language, guid);

1 0

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 1e214eb5d354ffbb64699686913a5eb61998ed78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e214eb5d354ffbb646996869… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 2 10:30:06 2014 +0200 Assorted spelling/grammar fixes. --- dlls/ddraw/tests/visual.c | 4 ++-- dlls/kernel32/environ.c | 2 +- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 2 +- dlls/shlwapi/tests/path.c | 2 +- programs/wineconsole/winecon_private.h | 2 +- programs/winhlp32/winhelp.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 097e8be..0385044 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -490,8 +490,8 @@ static void fog_test(IDirect3DDevice7 *device) {{ 0.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, }; /* Untransformed ones. Give them a different diffuse color to make the - * test look nicer. It also makes making sure that they are drawn - * correctly easier. */ + * test look nicer. It also helps making sure that they are drawn + * correctly. */ struct { struct vec4 position; diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 18cb44c..57b6a1f 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -503,7 +503,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf } /*********************************************************************** - * GetFirmwareEnvironmentVariableA (KERNEL32.@) + * GetFirmwareEnvironmentVariableW (KERNEL32.@) */ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1ae32d5..730574b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4324,7 +4324,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) ptr = &geoinfodata[n]; if (geoid == ptr->id) - /* we don't need empty entry */ + /* we don't need empty entries */ return *ptr->iso2W ? ptr : NULL; if (ptr->id > geoid) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index aad58b2..65172a7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3971,7 +3971,7 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_NATION, 0, test_geoid_enumproc); ok(ret, "got %d\n", ret); - /* only first level is enumerated, not the whole hierarchy */ + /* only the first level is enumerated, not the whole hierarchy */ geoidenum_count = 0; ret = pEnumSystemGeoID(GEOCLASS_NATION, 39070, test_geoid_enumproc2); if (ret == 0) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 1599313..1edb31e 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1626,7 +1626,7 @@ static void test_PathIsRelativeW(void) LPWSTR path; if (!pPathIsRelativeW) { - win_skip("PathIsRelativeA not available\n"); + win_skip("PathIsRelativeW not available\n"); return; } diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 1daf581..eec4171 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -75,7 +75,7 @@ struct inner_data { void (*fnSetFont)(struct inner_data* data, const WCHAR* font, unsigned height, unsigned weight); void (*fnDeleteBackend)(struct inner_data* data); - void* private; /* data part belonging to the chosen backed */ + void* private; /* data part belonging to the chosen backend */ }; /* from wineconsole.c */ diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 195a23f..ee5eecd 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -309,7 +309,7 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, /* Calculate horizontal size and position of a popup window */ GetWindowRect(parent->hMainWnd, &parent_rect); wi.size.cx = (parent_rect.right - parent_rect.left) / 2; - wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */ + wi.size.cy = 10; /* need a non null value, so that borders are taken into account while computing */ wi.origin.x = (short)LOWORD(mouse); wi.origin.y = (short)HIWORD(mouse);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 82f9e8a79ee31546df654acaf047964420a681ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f9e8a79ee31546df654acaf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 2 10:04:36 2014 +0200 po: Update French translation. --- po/fr.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6648d6a..29e5942 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-19 09:10+0100\n" +"PO-Revision-Date: 2014-10-02 10:04+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3564,16 +3564,12 @@ msgid "Expected ')'" msgstr "« ) » attendu" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Identifiant de clé du sujet" +msgstr "Identifiant attendu" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "« ; » attendu" +msgstr "« = » attendu" #: jscript.rc:42 msgid "Invalid character" @@ -3604,20 +3600,16 @@ msgid "Label not found" msgstr "Étiquette introuvable" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "« ; » attendu" +msgstr "« @end » attendu" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "La compilation conditionnelle est désactivée" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "« ; » attendu" +msgstr "« @ » attendu" #: jscript.rc:54 msgid "Number expected"

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B5G5R5X1.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: dabb07aea60a81e7ec0b670215f064b28c4d1d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabb07aea60a81e7ec0b67021… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:41 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G5R5X1. --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b13dd0..86aa235 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3215,6 +3215,29 @@ static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsig } } +static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0x8000; + else + dst_row[x] = src_color | 0x8000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3243,26 +3266,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G5R5X1: - { - /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ - const WORD *Source; - WORD *Dest; - TRACE("Color keyed 5551\n"); - for (y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = *Source++; - *Dest = color; - if (!color_in_range(&texture->src_blt_color_key, color)) - *Dest |= (1 << 15); - else - *Dest &= ~(1 << 15); - Dest++; - } - } - } - break; + convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); + break; case WINED3D_CT_CK_B8G8R8: for (y = 0; y < height; ++y)

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: e377ad45fac4b35cb76e2917f763173a1c09a0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e377ad45fac4b35cb76e2917f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:40 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0f13c9d..6b13dd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3192,6 +3192,29 @@ static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pit } } +static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = 0x8000 | ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + else + dst_row[x] = ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3215,21 +3238,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - WORD color = *(const WORD *)source; - if (!color_in_range(&texture->src_blt_color_key, color)) - *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); - else - *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); - source += 2; - dest += 2; - } - } + convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G5R5X1:

1 0

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 October 2014