October 2014 - Wine-Commits

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 9e312d34f13fb8e7da220824f384c54aaac34b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e312d34f13fb8e7da220824f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 1 17:22:21 2014 +0300 po: Update Finnish translation. --- po/fi.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index 01c6443..88fd213 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3534,16 +3534,12 @@ msgid "Expected ')'" msgstr "Odotettiin merkkiä ')'" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Haltijan avaimen tunniste" +msgstr "Odotettiin tunnistetta" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '='" #: jscript.rc:42 msgid "Invalid character" @@ -3574,20 +3570,16 @@ msgid "Label not found" msgstr "Nimiötä ei löydy" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin sanaa '@end'" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Ehdollinen kääntäminen on pois käytöstä" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '@'" #: jscript.rc:54 msgid "Number expected"

1 0

Nikolay Sivov : dwrite: Implement AnalyzeBidi().
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: fdd8454ef8fe41a1e695f8b9640d8b3f77a8e6da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd8454ef8fe41a1e695f8b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 30 09:56:39 2014 +0400 dwrite: Implement AnalyzeBidi(). --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/analyzer.c | 83 +++- dlls/dwrite/bidi.c | 1130 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/bracket.c | 106 ++++ dlls/dwrite/dwrite_private.h | 7 + tools/make_unicode | 1 + 6 files changed, 1322 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd8454ef8fe41a1e695f…

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlscript.c.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: b2c65c296f3664c78eba9665fd731c9f4c3d76ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c65c296f3664c78eba9665f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:47 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlscript.c. --- dlls/mshtml/htmlscript.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index dcab32f..1a61398 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -136,7 +136,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR return S_OK; } - nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; @@ -214,7 +214,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; @@ -433,10 +433,16 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) { + nsIDOMNode *nsnode; HTMLDOMNode *node; + nsresult nsres; HRESULT hres; - hres = get_node(doc, (nsIDOMNode*)nsscript, TRUE, &node); + nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMNode, (void**)&nsnode); + assert(nsres == NS_OK); + + hres = get_node(doc, nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Implicitly turn CC on for @if instruction.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: fcd9817581533a29b540546e9a08e593087740bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd9817581533a29b540546e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:37 2014 +0200 jscript: Implicitly turn CC on for @if instruction. --- dlls/jscript/lex.c | 3 +++ dlls/jscript/tests/run.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index e541182..b4a3700 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -1051,6 +1051,9 @@ static int cc_token(parser_ctx_t *ctx, void *lval) } if(!check_keyword(ctx, ifW, NULL)) { + if(!init_cc(ctx)) + return -1; + if(!skip_spaces(ctx) || *ctx->ptr != '(') return lex_error(ctx, JS_E_MISSING_LBRACKET); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 42336a4..aa1783e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2185,6 +2185,12 @@ static BOOL run_tests(void) parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("@if(true)\nif(@_jscript) reportSuccess();\n(a)end"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Implicitly turn CC on for @set instruction.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 8b3638879795465395a27dc9ccfcfdf39acab3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3638879795465395a27dc9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:30 2014 +0200 jscript: Implicitly turn CC on for @set instruction. --- dlls/jscript/lex.c | 20 +++++++++++++------- dlls/jscript/tests/run.c | 2 ++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3daaf47..e541182 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -852,7 +852,7 @@ static cc_var_t *find_cc_var(cc_ctx_t *cc, const WCHAR *name, unsigned name_len) return NULL; } -static int init_cc(parser_ctx_t *ctx) +static BOOL init_cc(parser_ctx_t *ctx) { cc_ctx_t *cc; @@ -865,11 +865,13 @@ static int init_cc(parser_ctx_t *ctx) static const WCHAR _jscript_versionW[] = {'_','j','s','c','r','i','p','t','_','v','e','r','s','i','o','n',0}; if(ctx->script->cc) - return 0; + return TRUE; cc = heap_alloc(sizeof(cc_ctx_t)); - if(!cc) - return lex_error(ctx, E_OUTOFMEMORY); + if(!cc) { + lex_error(ctx, E_OUTOFMEMORY); + return FALSE; + } cc->vars = NULL; @@ -879,11 +881,12 @@ static int init_cc(parser_ctx_t *ctx) || !new_cc_var(cc, _jscript_versionW, -1, ccval_num(JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0)) || !new_cc_var(cc, _jscript_buildW, -1, ccval_num(JSCRIPT_BUILD_VERSION))) { release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); + lex_error(ctx, E_OUTOFMEMORY); + return FALSE; } ctx->script->cc = cc; - return 0; + return TRUE; } static BOOL parse_cc_identifier(parser_ctx_t *ctx, const WCHAR **ret, unsigned *ret_len) @@ -1011,13 +1014,16 @@ static int cc_token(parser_ctx_t *ctx, void *lval) ctx->ptr++; if(!check_keyword(ctx, cc_onW, NULL)) - return init_cc(ctx); + return init_cc(ctx) ? 0 : -1; if(!check_keyword(ctx, setW, NULL)) { const WCHAR *ident; unsigned ident_len; cc_var_t *var; + if(!init_cc(ctx)) + return -1; + if(!skip_spaces(ctx)) return lex_error(ctx, JS_E_EXPECTED_AT); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index b8edd7d..42336a4 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2183,6 +2183,8 @@ static BOOL run_tests(void) CHECK_CALLED(testobj_withprop_d); CHECK_CALLED(testobj_withprop_i); + parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 7579a96ac1bb91db154ae3b4cadfc6f232a35856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7579a96ac1bb91db154ae3b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:59 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8. --- dlls/wined3d/surface.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2ee3db1..73b872f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1606,7 +1606,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3247,17 +3247,16 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; - DWORD dstcolor = color << 8; + for (x = 0; x < width; ++x) + { + DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + color |= 0xff000000; + *(DWORD *)dest = color; source += 3; dest += 4; }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: fcf4f1c697f775679b09ef19d69c575fa98d7b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf4f1c697f775679b09ef19d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 07:47:09 2014 +0400 po: Update Russian translation. --- po/ru.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 818c087..2edc019 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3546,16 +3546,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" @@ -3586,20 +3582,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

Alexandre Julliard : kernel32/tests: Fix overlapped status checks for 64-bit.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 5afbb6ba9e958ca21d03093165a85884827fe748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afbb6ba9e958ca21d0309316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 1 21:14:24 2014 +0200 kernel32/tests: Fix overlapped status checks for 64-bit. --- dlls/kernel32/tests/change.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 9226950..ad22f18 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -472,7 +472,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -502,7 +502,7 @@ static void test_readdirectorychanges(void) r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); - ok( ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); ok( ov.InternalHigh == 1, "ov.InternalHigh wrong\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -514,10 +514,10 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); - if (ov.Internal == STATUS_SUCCESS) + if ((NTSTATUS)ov.Internal == STATUS_SUCCESS) { r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); ok( r == TRUE, "getoverlappedresult failed\n"); @@ -540,7 +540,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); /* test the recursive watch */ @@ -553,7 +553,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -589,7 +589,7 @@ static void test_readdirectorychanges(void) ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); @@ -666,7 +666,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 0 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); ov.Internal = 0; @@ -687,7 +687,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -763,7 +763,7 @@ static void test_readdirectorychanges_filedir(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer;

1 0

Nikolay Sivov : usp10: Remove comment that's no longer true.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 5281bff120fa377703948945201dc63bb97392b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5281bff120fa3777039489452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 18:34:44 2014 +0400 usp10: Remove comment that's no longer true. --- dlls/usp10/usp10.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8769bd9..6aa6b3e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3407,10 +3407,6 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB * Success: S_OK * Failure: Non-zero HRESULT value. * - * BUGS - * This stub works correctly for any sequence of a single - * embedding level but not for sequences of different - * embedding levels, i.e. mixtures of RTL and LTR scripts. */ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) {

1 0

Shuai Meng : vbscript: Implemented RGB.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 0480bbfb343e5fce6004366e85a0ab5269ad0fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0480bbfb343e5fce6004366e8… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Sep 30 18:31:08 2014 +0800 vbscript: Implemented RGB. --- dlls/vbscript/global.c | 20 ++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2901623..93fdcc3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -778,8 +778,24 @@ static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + int i, color[3]; + + TRACE("%s %s %s\n", debugstr_variant(arg), debugstr_variant(arg + 1), debugstr_variant(arg + 2)); + + assert(args_cnt == 3); + + for(i = 0; i < 3; i++) { + hres = to_int(arg + i, color + i); + if(FAILED(hres)) + return hres; + if(color[i] > 255) + color[i] = 255; + if(color[i] < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + + return return_int(res, RGB(color[0], color[1], color[2])); } static HRESULT Global_Len(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 9e64412..e2efa98 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1242,4 +1242,26 @@ Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CB Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) +Sub testRGBError(arg1, arg2, arg3, error_num) + on error resume next + Dim x + + Call Err.clear() + x = RGB(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number1 = " & Err.number) + + Call Err.clear() + Call RGB(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number2 = " & Err.number) +End Sub + +Call ok(RGB(0, &h1f&, &hf1&) = &hf11f00&, "RGB(0, &h1f&, &hf1&) = " & RGB(0, &h1f&, &hf1&)) +Call ok(getVT(RGB(0, &h1f&, &hf1&)) = "VT_I4", "getVT(RGB(&hf1&, &h1f&, &hf1&)) = " & getVT(RGB(&hf1&, &h1f&, &hf1&))) +Call ok(RGB(&hef&, &hab&, &hcd&) = &hcdabef&, "RGB(&hef&, &hab&, &hcd&) = " & RGB(&hef&, &hab&, &hcd&)) +Call ok(getVT(RGB(&hef&, &hab&, &hcd&)) = "VT_I4", "getVT(RGB(&hef&, &hab&, &hcd&)) = " & getVT(RGB(&hef&, &hab&, &hcd&))) +Call ok(RGB(&h1&, &h100&, &h111&) = &hffff01&, "RGB(&h1&, &h100&, &h111&) = " & RGB(&h1&, &h100&, &h111&)) +Call ok(getVT(RGB(&h1&, &h100&, &h111&)) = "VT_I4", "getVT(RGB(&h1&, &h100&, &h111&)) = " & getVT(RGB(&h1&, &h100&, &h111&))) +Call testRGBError(-1, &h1e&, &h3b&, 5) +Call testRGBError(&h4d&, -2, &h2f&, 5) + Call reportSuccess()

1 0