wine-commits November 2012

2 participants
708 discussions

Carlos Rafael Ramirez : po: Update Spanish translation.

by Alexandre Julliard

Module: wine Branch: master Commit: 010449622c2dd2e7e914aadfe4a757732023aa1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=010449622c2dd2e7e914aadfe… Author: Carlos Rafael Ramirez <crramirez(a)gmail.com> Date: Fri Nov 30 11:28:38 2012 -0600 po: Update Spanish translation. --- po/es.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/es.po b/po/es.po index cc7c935..fee1edc 100644 --- a/po/es.po +++ b/po/es.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: 2012-02-23 09:23+0100\n" +"PO-Revision-Date: 2012-11-30 11:26-0600\n" "Last-Translator: Eduardo García <eduardo.garcia(a)gmx.com>\n" "Language-Team: none\n" "Language: Spanish\n" @@ -3511,10 +3511,8 @@ msgid "" msgstr "" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Crear control" +msgstr "Mandos de juego" #: jscript.rc:25 msgid "Error converting object to primitive type"

11 years, 4 months

Alexandre Julliard : gdi32: Avoid computing grayscale glyph intensities when not needed.

by Alexandre Julliard

Module: wine Branch: master Commit: 2d3385eec93674613a78b037ed751384b505deaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3385eec93674613a78b037e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:24:05 2012 +0100 gdi32: Avoid computing grayscale glyph intensities when not needed. --- dlls/gdi32/dibdrv/dibdrv.h | 4 +- dlls/gdi32/dibdrv/graphics.c | 61 +++++++++++++++-------------------------- dlls/gdi32/dibdrv/objects.c | 32 +++++++++++----------- 3 files changed, 40 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d3385eec93674613a78b…

11 years, 4 months

Alexandre Julliard : gdi32: Use the faster memset for vertical gradients.

by Alexandre Julliard

Module: wine Branch: master Commit: abdce5c2c818506a56c9dc4a0d9a9e5184ae63d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdce5c2c818506a56c9dc4a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:59:04 2012 +0100 gdi32: Use the faster memset for vertical gradients. --- dlls/gdi32/dibdrv/primitives.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 77ac620..a8270ae 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -4520,7 +4520,7 @@ static BOOL gradient_rect_8888( const dib_info *dib, const RECT *rc, const TRIVE for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 4) { DWORD val = gradient_rgb_8888( v, y - v[0].y, v[1].y - v[0].y ); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; + memset_32( ptr, val, rc->right - rc->left ); } break; @@ -4570,7 +4570,7 @@ static BOOL gradient_rect_32( const dib_info *dib, const RECT *rc, const TRIVERT break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 4) { DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); if (dib->red_len == 8 && dib->green_len == 8 && dib->blue_len == 8) @@ -4582,8 +4582,7 @@ static BOOL gradient_rect_32( const dib_info *dib, const RECT *rc, const TRIVERT put_field( val >> 8, dib->green_shift, dib->green_len ) | put_field( val, dib->blue_shift, dib->blue_len )); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; - ptr += dib->stride / 4; + memset_32( ptr, val, rc->right - rc->left ); } break;

11 years, 4 months

Alexandre Julliard : gdi32: Make blend_subpixel inline.

by Alexandre Julliard

Module: wine Branch: master Commit: d10d95608cd49c5eb3dea152c7f737be8efcc13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d95608cd49c5eb3dea152c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:23:37 2012 +0100 gdi32: Make blend_subpixel inline. --- dlls/gdi32/dibdrv/primitives.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index bcd2900..77ac620 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5153,7 +5153,7 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in return; } -static DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) { return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 |

11 years, 4 months

André Hentschel : kernel32/tests: Fix crashes on win8 in console.

by Alexandre Julliard

Module: wine Branch: master Commit: 27b0b93684dafa39b799e6056d13c00bde307f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b0b93684dafa39b799e6056… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 27 02:52:46 2012 +0100 kernel32/tests: Fix crashes on win8 in console. --- dlls/kernel32/tests/console.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4b9cfb6..b1907d7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1354,12 +1354,12 @@ static void test_WriteConsoleInputA(HANDLE input_handle) LPDWORD written; DWORD expected_count; DWORD last_error; - int win7_crash; + int win_crash; } invalid_table[] = { {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, @@ -1367,14 +1367,14 @@ static void test_WriteConsoleInputA(HANDLE input_handle) {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, @@ -1406,7 +1406,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle) for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) { - if (invalid_table[i].win7_crash) + if (invalid_table[i].win_crash) continue; SetLastError(0xdeadbeef); @@ -1597,12 +1597,12 @@ static void test_WriteConsoleInputW(HANDLE input_handle) LPDWORD written; DWORD expected_count; DWORD last_error; - int win7_crash; + int win_crash; } invalid_table[] = { {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, @@ -1610,14 +1610,14 @@ static void test_WriteConsoleInputW(HANDLE input_handle) {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, @@ -1649,7 +1649,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle) for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) { - if (invalid_table[i].win7_crash) + if (invalid_table[i].win_crash) continue; SetLastError(0xdeadbeef);

11 years, 4 months

André Hentschel : kernel32/tests: Fix crash on win8 in module.

by Alexandre Julliard

Module: wine Branch: master Commit: 428180ce542cca65a30dfbd36521d9c152b0c296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428180ce542cca65a30dfbd36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 27 02:52:21 2012 +0100 kernel32/tests: Fix crash on win8 in module. --- dlls/kernel32/tests/module.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index f88c8cb..e8d51e1 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -476,12 +476,16 @@ static void testGetDllDirectory(void) ok(bufferW[0] == 0 || /* XP, 2003 */ broken(bufferW[0] == 'A'), "i=%d, Buffer overflow\n", i); - /* no buffer, but too short length */ - ret = pGetDllDirectoryA(length, NULL); - ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + if (0) + { + /* crashes on win8 */ + /* no buffer, but too short length */ + ret = pGetDllDirectoryA(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); - ret = pGetDllDirectoryW(length, NULL); - ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ret = pGetDllDirectoryW(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + } } /* unset whatever we did so following tests won't be affected */

11 years, 4 months

Michael Stefaniuc : riched20/tests: Remove a superfluous function pointer cast.

by Alexandre Julliard

Module: wine Branch: master Commit: 87cdc7341d15037e94f32f7ced1df750c04a512b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cdc7341d15037e94f32f7ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 30 14:05:01 2012 +0100 riched20/tests: Remove a superfluous function pointer cast. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fa80def..d72b4e1 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5173,7 +5173,7 @@ static void test_EM_StreamIn_Undo(void) char buffer[1024] = {0}; const char randomtext[] = "Some text"; - es.pfnCallback = (EDITSTREAMCALLBACK) EditStreamCallback; + es.pfnCallback = EditStreamCallback; /* StreamIn, no SFF_SELECTION */ es.dwCookie = nCallbackCount;

11 years, 4 months

Michael Stefaniuc : comctl32: Remove a superfluous function pointer cast.

by Alexandre Julliard

Module: wine Branch: master Commit: 5bade39f55487f1a53b9380006e05faac0394d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bade39f55487f1a53b938000… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 30 13:48:00 2012 +0100 comctl32: Remove a superfluous function pointer cast. --- dlls/comctl32/progress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index d331d19..aba5302 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -745,7 +745,7 @@ void PROGRESS_Register (void) ZeroMemory (&wndClass, sizeof(wndClass)); wndClass.style = CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; - wndClass.lpfnWndProc = (WNDPROC)ProgressWindowProc; + wndClass.lpfnWndProc = ProgressWindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof (PROGRESS_INFO *); wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW);

11 years, 4 months

Michael Stefaniuc : winex11.drv: The winediag debug channel is only used for HAVE_XRRGETSCREENRESOURCES.

by Alexandre Julliard

Module: wine Branch: master Commit: abf4250c726e3ec53fec79d0e4d6f695b456c798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf4250c726e3ec53fec79d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 30 13:33:24 2012 +0100 winex11.drv: The winediag debug channel is only used for HAVE_XRRGETSCREENRESOURCES. --- dlls/winex11.drv/xrandr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5b2dede..5ec8842 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -24,7 +24,9 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); +#ifdef HAVE_XRRGETSCREENRESOURCES WINE_DECLARE_DEBUG_CHANNEL(winediag); +#endif #ifdef SONAME_LIBXRANDR

11 years, 4 months

Jacek Caban : jscript: Added support for indexed string access.

by Alexandre Julliard

Module: wine Branch: master Commit: 0e5933f70a5f8ab127cce5ac6cbc4b23ebd84af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5933f70a5f8ab127cce5ac6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:03:07 2012 +0100 jscript: Added support for indexed string access. --- dlls/jscript/string.c | 33 ++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 3 +++ dlls/jscript/tests/lang.js | 14 ++++++++++++++ 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index c7aaf64..ce5d702 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1396,6 +1396,35 @@ static void String_destructor(jsdisp_t *dispex) heap_free(This); } +static unsigned String_idx_length(jsdisp_t *jsdisp) +{ + StringInstance *string = (StringInstance*)jsdisp; + + /* + * NOTE: For invoke version < 2, indexed array is not implemented at all. + * Newer jscript.dll versions implement it on string type, not class, + * which is not how it should work according to spec. IE9 implements it + * properly, but it uses its own JavaScript engine inside MSHTML. We + * implement it here, but in the way IE9 and spec work. + */ + return string->dispex.ctx->version < 2 ? 0 : jsstr_length(string->str); +} + +static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) +{ + StringInstance *string = (StringInstance*)jsdisp; + jsstr_t *ret; + + TRACE("%p[%u] = %s\n", string, idx, debugstr_wn(string->str->str+idx, 1)); + + ret = jsstr_alloc_len(string->str->str+idx, 1); + if(!ret) + return E_OUTOFMEMORY; + + *r = jsval_string(ret); + return S_OK; +} + static const builtin_prop_t String_props[] = { {anchorW, String_anchor, PROPF_METHOD|1}, {bigW, String_big, PROPF_METHOD}, @@ -1451,7 +1480,9 @@ static const builtin_info_t StringInst_info = { sizeof(StringInst_props)/sizeof(*StringInst_props), StringInst_props, String_destructor, - NULL + NULL, + String_idx_length, + String_idx_get }; /* ECMA-262 3rd Edition 15.5.3.2 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ce2f153..5f5d009 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1785,6 +1785,9 @@ function callTest(argc) { ok(arguments.length === argc+1, "arguments.length = " + arguments.length + " expected " + (argc+1)); for(var i=1; i <= argc; i++) ok(arguments[i] === i, "arguments[i] = " + arguments[i]); + var a = arguments; + for(var i=1; i <= argc; i++) + ok(a[i] === i, "a[i] = " + a[i]); } callTest.call(tmp, 1, 1); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 92292a4..5d1bbfa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1199,6 +1199,20 @@ try { }catch(e) {} ok(!("prop" in obj), "prop in obj"); +if(invokeVersion >= 2) { + ok("test"[0] === "t", '"test"[0] = ' + test[0]); + ok("test"[5] === undefined, '"test"[0] = ' + test[0]); + + tmp = "test"; + ok(tmp[1] === "e", "tmp[1] = " + tmp[1]); + tmp[1] = "x"; + ok(tmp[1] === "e", "tmp[1] = " + tmp[1]); + ok(tmp["1"] === "e", "tmp['1'] = " + tmp["1"]); + ok(tmp["0x1"] === undefined, "tmp['0x1'] = " + tmp["0x1"]); +}else { + ok("test"[0] === undefined, '"test"[0] = ' + test[0]); +} + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false");

11 years, 4 months

Jump to page:

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 2012