October 2014 - Wine-commits

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

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

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 : 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

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-(a)_jscript) ok(@test === 0, "@test = " + @test); +(a)set @test = (true==1) +ok(@test === true, "@test = " + @test); + +(a)set @test = (1==false+1) +ok(@test === true, "@test = " + @test); + +(a)set @test = (1+true==false+1) +ok(@test === false, "@test = " + @test); + @if (false) this wouldn not parse "@end

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); -(a)set @test = (1+true==false+1) -ok(@test === false, "@test = " + @test); +function expect(val, exval) { + ok(val === exval, "got " + val + " expected " + exval); +} + +(a)set @test = (false < 0.5) +expect(@test, true); + +(a)set @test = (true == 0 < 0.5) +expect(@test, true); + +(a)set @test = (false < 0) +expect(@test, false); + +(a)set @test = (false > 0.5) +expect(@test, false); + +(a)set @test = (1 < true) +expect(@test, false); + +(a)set @test = (1 <= true) +expect(@test, true); + +(a)set @test = (1 >= true) +expect(@test, true); + +(a)set @test = (1 >= true-1) +expect(@test, true); @if (false) this wouldn not parse

1 0

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

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_LARGE_FETCH flag.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 20b5c99f1172933e1736601c39373795f8395cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b5c99f1172933e1736601c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 03:53:30 2014 +0200 kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_LARGE_FETCH flag. --- dlls/kernel32/tests/file.c | 15 +++++++++++---- include/winbase.h | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ddfa019..106e68a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2562,7 +2562,7 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } -static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) +static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) { WIN32_FIND_DATAA search_results; HANDLE handle; @@ -2579,12 +2579,17 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, 0); + handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); goto cleanup; } + if ((flags & FIND_FIRST_EX_LARGE_FETCH) && handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("FindFirstFileExA flag FIND_FIRST_EX_LARGE_FETCH not supported, skipping test\n"); + goto cleanup; + } ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); @@ -4171,9 +4176,11 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); - test_FindFirstFileExA(0); + test_FindFirstFileExA(0, 0); + test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ - test_FindFirstFileExA(FindExSearchLimitToDirectories); + test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure(); diff --git a/include/winbase.h b/include/winbase.h index dd5e816..edd6ad6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -289,6 +289,9 @@ typedef enum _FINDEX_INFO_LEVELS FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; +#define FIND_FIRST_EX_CASE_SENSITIVE 1 +#define FIND_FIRST_EX_LARGE_FETCH 2 + typedef enum _FINDEX_SEARCH_OPS { FindExSearchNameMatch,

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_CASE_SENSITIVE flag.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: c9b4344322b29441886d297925b4c2f0c120ccba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b4344322b29441886d29792… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 04:01:36 2014 +0200 kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_CASE_SENSITIVE flag. --- dlls/kernel32/tests/file.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 106e68a..0973efe 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2608,22 +2608,38 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) skip("File system supports directory filtering\n"); /* Results from the previous call are not cleared */ ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName); - FindClose( handle ); - goto cleanup; } + else + { + ok(ret, "Fetching fourth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); - ok(ret, "Fetching fourth file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); + ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); - ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); + ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); + } #undef CHECK_NAME - ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); - FindClose( handle ); + /* Most Windows systems seem to ignore the FIND_FIRST_EX_CASE_SENSITIVE flag. Unofficial documentation + * suggests that there are registry keys and that it might depend on the used filesystem. */ + SetLastError(0xdeadbeef); + handle = pFindFirstFileExA("TEST-DIR\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + if (flags & FIND_FIRST_EX_CASE_SENSITIVE) + { + ok(handle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_PATH_NOT_FOUND, + "Unexpected error %x, expected valid handle or ERROR_PATH_NOT_FOUND\n", GetLastError()); + trace("FindFirstFileExA flag FIND_FIRST_EX_CASE_SENSITIVE is %signored\n", + (handle == INVALID_HANDLE_VALUE) ? "not " : ""); + } + else + ok(handle != INVALID_HANDLE_VALUE, "Unexpected error %x, expected valid handle\n", GetLastError()); + if (handle != INVALID_HANDLE_VALUE) + FindClose( handle ); + cleanup: DeleteFileA("test-dir\\file1"); DeleteFileA("test-dir\\file2"); @@ -4177,9 +4193,11 @@ START_TEST(file) test_FindFirstFileA(); test_FindNextFileA(); test_FindFirstFileExA(0, 0); + test_FindFirstFileExA(0, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); test_LockFile(); test_file_sharing();

1 0

Sebastian Lackner : shlwapi/tests: Add test for SHMapHandle.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: ef065486dd851b390b64ba7eda884e74913bf8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef065486dd851b390b64ba7ed… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:40:54 2014 +0200 shlwapi/tests: Add test for SHMapHandle. --- dlls/shlwapi/tests/ordinal.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 64b07f3..7c7c4a0 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -46,6 +46,7 @@ static HANDLE (WINAPI *pSHAllocShared)(LPCVOID,DWORD,DWORD); static LPVOID (WINAPI *pSHLockShared)(HANDLE,DWORD); static BOOL (WINAPI *pSHUnlockShared)(LPVOID); static BOOL (WINAPI *pSHFreeShared)(HANDLE,DWORD); +static HANDLE (WINAPI *pSHMapHandle)(HANDLE,DWORD,DWORD,DWORD,DWORD); static HRESULT(WINAPIV *pSHPackDispParams)(DISPPARAMS*,VARIANTARG*,UINT,...); static HRESULT(WINAPI *pIConnectionPoint_SimpleInvoke)(IConnectionPoint*,DISPID,DISPPARAMS*); static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DISPID,DISPPARAMS*,DWORD,DWORD); @@ -519,8 +520,10 @@ static void test_alloc_shared(int argc, char **argv) static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) { struct shared_struct val, *p; + HANDLE hmem2; BOOL ret; + /* test directly accessing shared memory of a remote process */ p = pSHLockShared(hmem, procid); ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); if (p == NULL) @@ -539,6 +542,35 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) ret = pSHUnlockShared(p); ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + /* test SHMapHandle */ + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); + + /* It seems like Windows Vista/2008 uses a different internal implementation + * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ + todo_wine + ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), + "SHMapHandle failed: %u\n", GetLastError()); + if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) + { + skip("Subprocess failed to map shared memory, skipping test\n"); + return; + } + + p = pSHLockShared(hmem2, GetCurrentProcessId()); + todo_wine + ok(p != NULL, "SHLockShared failed: %u\n", GetLastError()); + + if (p != NULL) + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + + ret = pSHUnlockShared(p); + todo_wine + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, GetCurrentProcessId()); + todo_wine + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -3014,6 +3046,7 @@ static void init_pointers(void) MAKEFUNC(SHLockShared, 8); MAKEFUNC(SHUnlockShared, 9); MAKEFUNC(SHFreeShared, 10); + MAKEFUNC(SHMapHandle, 11); MAKEFUNC(GetAcceptLanguagesA, 14); MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(SHSetParentHwnd, 167);

1 0