wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Carlos Rafael Ramirez : po: Update Spanish translation.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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"

1 0

Alexandre Julliard : gdi32: Avoid computing grayscale glyph intensities when not needed.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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…

1 0

Alexandre Julliard : gdi32: Use the faster memset for vertical gradients.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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;

1 0

Alexandre Julliard : gdi32: Make blend_subpixel inline.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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 |

1 0

André Hentschel : kernel32/tests: Fix crashes on win8 in console.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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);

1 0

André Hentschel : kernel32/tests: Fix crash on win8 in module.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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 */

1 0

Michael Stefaniuc : riched20/tests: Remove a superfluous function pointer cast.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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;

1 0

Michael Stefaniuc : comctl32: Remove a superfluous function pointer cast.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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);

1 0

Michael Stefaniuc : winex11.drv: The winediag debug channel is only used for HAVE_XRRGETSCREENRESOURCES.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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

1 0

Jacek Caban : jscript: Added support for indexed string access.
by Alexandre Julliard 30 Nov '12

30 Nov '12

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");

1 0

Jacek Caban : jscript: Cut arguments circular reference after returning from the function.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 956cb343b28a9d28883a89826c08e867576836a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956cb343b28a9d28883a89826… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:50 2012 +0100 jscript: Cut arguments circular reference after returning from the function. --- dlls/jscript/function.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 5c7f9b5..b058460 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -221,25 +221,35 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis } hres = jsdisp_propput(var_disp, argumentsW, PROPF_DONTDELETE, jsval_obj(arg_disp)); + if(FAILED(hres)) { + jsdisp_release(arg_disp); + jsdisp_release(var_disp); + return hres; + } + + hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); + hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); + scope_release(scope); + if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); - scope_release(scope); + jsdisp_t *prev_args; + + prev_args = function->arguments; + function->arguments = arg_disp; + hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); + function->arguments = prev_args; + + exec_release(exec_ctx); } } - jsdisp_release(var_disp); - if(SUCCEEDED(hres)) { - jsdisp_t *prev_args; - prev_args = function->arguments; - function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); - function->arguments = prev_args; - } + /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have + * their own arguments property, it's impossible to use prototype's one during name lookup */ + jsdisp_propput_name(var_disp, argumentsW, jsval_undefined()); jsdisp_release(arg_disp); - exec_release(exec_ctx); + jsdisp_release(var_disp); return hres; }

1 0

Jacek Caban : jscript: Added support for DontDelete attribute and use it for arguments object.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d9d8c8b71604b7edbd805c21af308ae4546f27d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d8c8b71604b7edbd805c21a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:32 2012 +0100 jscript: Added support for DontDelete attribute and use it for arguments object. --- dlls/jscript/dispex.c | 42 ++++++++++++++++++++++++------------------ dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 12 +++++++----- dlls/jscript/tests/lang.js | 4 ++++ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1b7ae50..2cd4ad5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -740,8 +740,15 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } -static HRESULT delete_prop(dispex_prop_t *prop) +static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->flags & PROPF_DONTDELETE) { + *ret = FALSE; + return S_OK; + } + + *ret = TRUE; /* FIXME: not exactly right */ + if(prop->type == PROP_JSVAL) { jsval_release(prop->u.val); prop->type = PROP_DELETED; @@ -753,6 +760,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst { jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; + BOOL b; HRESULT hres; TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); @@ -768,13 +776,14 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst return S_OK; } - return delete_prop(prop); + return delete_prop(prop, &b); } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; + BOOL b; TRACE("(%p)->(%x)\n", This, id); @@ -784,7 +793,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID return DISP_E_MEMBERNOTFOUND; } - return delete_prop(prop); + return delete_prop(prop, &b); } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) @@ -1266,18 +1275,23 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } -HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) +HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t val) { dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, FALSE, PROPF_ENUM, &prop); + hres = ensure_prop_name(obj, name, FALSE, flags, &prop); if(FAILED(hres)) return hres; return prop_put(obj, prop, val, NULL); } +HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) +{ + return jsdisp_propput(obj, name, PROPF_ENUM, val); +} + HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) { dispex_prop_t *prop; @@ -1292,14 +1306,7 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - dispex_prop_t *prop; - HRESULT hres; - - hres = ensure_prop_name(obj, name, FALSE, 0, &prop); - if(FAILED(hres)) - return hres; - - return prop_put(obj, prop, val, NULL); + return jsdisp_propput(obj, name, 0, val); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) @@ -1451,6 +1458,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) static const WCHAR formatW[] = {'%','d',0}; WCHAR buf[12]; dispex_prop_t *prop; + BOOL b; HRESULT hres; sprintfW(buf, formatW, idx); @@ -1459,7 +1467,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) if(FAILED(hres) || !prop) return hres; - return delete_prop(prop); + return delete_prop(prop, &b); } HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) @@ -1472,10 +1480,9 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) if(jsdisp) { dispex_prop_t *prop; - *ret = TRUE; prop = get_prop(jsdisp, id); if(prop) - hres = delete_prop(prop); + hres = delete_prop(prop, ret); else hres = DISP_E_MEMBERNOTFOUND; @@ -1508,10 +1515,9 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL if(jsdisp) { dispex_prop_t *prop; - *ret = TRUE; hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); if(prop) - hres = delete_prop(prop); + hres = delete_prop(prop, ret); else hres = DISP_E_MEMBERNOTFOUND; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 329bec2..5c7f9b5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -220,7 +220,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return hres; } - hres = jsdisp_propput_name(var_disp, argumentsW, jsval_obj(arg_disp)); + hres = jsdisp_propput(var_disp, argumentsW, PROPF_DONTDELETE, jsval_obj(arg_disp)); if(SUCCEEDED(hres)) { hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 69ac417..5bffc21 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -95,11 +95,12 @@ typedef struct jsdisp_t jsdisp_t; extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; -#define PROPF_ARGMASK 0x00ff -#define PROPF_METHOD 0x0100 -#define PROPF_ENUM 0x0200 -#define PROPF_CONSTR 0x0400 -#define PROPF_CONST 0x0800 +#define PROPF_ARGMASK 0x00ff +#define PROPF_METHOD 0x0100 +#define PROPF_ENUM 0x0200 +#define PROPF_CONSTR 0x0400 +#define PROPF_CONST 0x0800 +#define PROPF_DONTDELETE 0x1000 /* NOTE: Keep in sync with names in Object.toString implementation */ typedef enum { @@ -268,6 +269,7 @@ HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index fa3d6d2..92292a4 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -86,6 +86,10 @@ function testFunc1(x, y) { ok(this === test, "this !== test"); eval('ok(this === test, "this !== test");'); + tmp = delete arguments; + ok(tmp === false, "arguments deleted"); + ok(typeof(arguments) === "object", "typeof(arguments) = " + typeof(arguments)); + return true; }

1 0

Jacek Caban : jscript: Added disp_delete_name helper and use it in interp_delete.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 466fae6444f26b77c76ddde1fa1c807fe271fb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466fae6444f26b77c76ddde1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:19 2012 +0100 jscript: Added disp_delete_name helper and use it in interp_delete. --- dlls/jscript/dispex.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 21 +-------------------- dlls/jscript/jscript.h | 1 + 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d7ff77d..1b7ae50 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1498,6 +1498,49 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) return S_OK; } +HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL *ret) +{ + IDispatchEx *dispex; + jsdisp_t *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + *ret = TRUE; + hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); + if(prop) + hres = delete_prop(prop); + else + hres = DISP_E_MEMBERNOTFOUND; + + jsdisp_release(jsdisp); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + BSTR bstr; + + bstr = SysAllocStringLen(name->str, jsstr_length(name)); + if(bstr) { + hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); + SysFreeString(bstr); + *ret = TRUE; + }else { + hres = E_OUTOFMEMORY; + } + + IDispatchEx_Release(dispex); + }else { + hres = S_OK; + ret = FALSE; + } + + return hres; +} + HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 20791bf..3fedea1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1592,7 +1592,6 @@ static HRESULT interp_mod(exec_ctx_t *ctx) static HRESULT interp_delete(exec_ctx_t *ctx) { jsval_t objv, namev; - IDispatchEx *dispex; IDispatch *obj; jsstr_t *name; BOOL ret; @@ -1617,25 +1616,7 @@ static HRESULT interp_delete(exec_ctx_t *ctx) return hres; } - hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - BSTR bstr; - - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(bstr) { - hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx->script, fdexNameCaseSensitive)); - SysFreeString(bstr); - ret = TRUE; - }else { - hres = E_OUTOFMEMORY; - } - - IDispatchEx_Release(dispex); - }else { - hres = S_OK; - ret = FALSE; - } - + hres = disp_delete_name(ctx->script, obj, name, &ret); IDispatch_Release(obj); jsstr_release(name); if(FAILED(hres)) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 147cc1a..69ac417 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -276,6 +276,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; +HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*); HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added disp_delete helper and use it in interp_delete_ident.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: e6fc8d9b0cb2f845cb011b0a081898633bb66237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fc8d9b0cb2f845cb011b0a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:05 2012 +0100 jscript: Added disp_delete helper and use it in interp_delete_ident. --- dlls/jscript/dispex.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 15 ++++----------- dlls/jscript/jscript.h | 1 + 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 640e954..d7ff77d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1462,6 +1462,42 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) return delete_prop(prop); } +HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) +{ + IDispatchEx *dispex; + jsdisp_t *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + *ret = TRUE; + prop = get_prop(jsdisp, id); + if(prop) + hres = delete_prop(prop); + else + hres = DISP_E_MEMBERNOTFOUND; + + jsdisp_release(jsdisp); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + *ret = FALSE; + return S_OK; + } + + hres = IDispatchEx_DeleteMemberByDispID(dispex, id); + IDispatchEx_Release(dispex); + if(FAILED(hres)) + return hres; + + *ret = TRUE; + return S_OK; +} + HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f4dcc0f..20791bf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1648,9 +1648,8 @@ static HRESULT interp_delete(exec_ctx_t *ctx) static HRESULT interp_delete_ident(exec_ctx_t *ctx) { const BSTR arg = get_op_bstr(ctx, 0); - IDispatchEx *dispex; exprval_t exprval; - BOOL ret = FALSE; + BOOL ret; HRESULT hres; TRACE("%s\n", debugstr_w(arg)); @@ -1665,16 +1664,10 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) return E_NOTIMPL; } - hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); + hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); IDispatch_Release(exprval.u.idref.disp); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); - IDispatchEx_Release(dispex); - if(FAILED(hres)) - return hres; - - ret = TRUE; - } + if(FAILED(hres)) + return ret; return stack_push(ctx, jsval_bool(ret)); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1c84823..147cc1a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -275,6 +275,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; +HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Alias arguments properties to real values.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 6b56c65f8db8dc733e356def032200f5a361ce23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b56c65f8db8dc733e356def0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:01:51 2012 +0100 jscript: Alias arguments properties to real values. --- dlls/jscript/dispex.c | 35 ++++++++++++++-- dlls/jscript/function.c | 98 ++++++++++++++++++++++++++++++++----------- dlls/jscript/jscript.h | 3 + dlls/jscript/tests/lang.js | 9 ++++ 4 files changed, 116 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b56c65f8db8dc733e356…

1 0

Jacek Caban : hhctrl.ocx: Added import library.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 4821b06ed11cbd3e7648c81e884cde4a8abc89d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4821b06ed11cbd3e7648c81e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 11:12:39 2012 +0100 hhctrl.ocx: Added import library. --- .gitignore | 1 + configure | 2 +- configure.ac | 2 +- dlls/hhctrl.ocx/Makefile.in | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dde97a4..036a810 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h dlls/libd3dcompiler.def dlls/libd3dx9.def +dlls/libhtmlhelp.def dlls/libkernel.def dlls/libwinspool.def dlls/libxinput.def diff --git a/configure b/configure index bf5c81c..61f3f9a 100755 --- a/configure +++ b/configure @@ -15497,7 +15497,7 @@ wine_fn_config_dll glu32 enable_glu32 implib wine_fn_config_dll gphoto2.ds enable_gphoto2_ds po wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal -wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx po +wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx implib,po htmlhelp wine_fn_config_dll hid enable_hid implib wine_fn_config_dll hlink enable_hlink implib wine_fn_config_test dlls/hlink/tests hlink_test diff --git a/configure.ac b/configure.ac index 2f1032b..c8a5e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -2703,7 +2703,7 @@ WINE_CONFIG_DLL(glu32,,[implib]) WINE_CONFIG_DLL(gphoto2.ds,,[po]) WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) -WINE_CONFIG_DLL(hhctrl.ocx,,[po]) +WINE_CONFIG_DLL(hhctrl.ocx,,[implib,po],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) WINE_CONFIG_DLL(hlink,,[implib]) WINE_CONFIG_TEST(dlls/hlink/tests) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 289cc39..4545bde 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = hhctrl.ocx +IMPORTLIB = htmlhelp IMPORTS = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 C_SRCS = \

1 0

Charles Davis : ntdll: Add support for BSD-style creation ("birth") time.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 5da1eaf2131f29264b734bdf4cde072115b0762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da1eaf2131f29264b734bdf4… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Nov 29 21:50:46 2012 -0700 ntdll: Add support for BSD-style creation ("birth") time. --- configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 +++++++++++++- dlls/ntdll/file.c | 14 ++++++++++++++ include/config.h.in | 15 +++++++++++++++ 4 files changed, 87 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 638ddfb..bf5c81c 100755 --- a/configure +++ b/configure @@ -14177,6 +14177,51 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim" "ac_cv_member_struct_stat_st_birthtim" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_birthtim" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIM 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec" "ac_cv_member_struct_stat_st_birthtimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_birthtimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "__st_birthtime" "ac_cv_member_struct_stat___st_birthtime" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat___st_birthtime" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT___ST_BIRTHTIME 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "__st_birthtim" "ac_cv_member_struct_stat___st_birthtim" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat___st_birthtim" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT___ST_BIRTHTIM 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef HAVE_SYS_TYPES_H diff --git a/configure.ac b/configure.ac index 5d2b4f4..2f1032b 100644 --- a/configure.ac +++ b/configure.ac @@ -2269,7 +2269,19 @@ AC_CHECK_MEMBERS([struct option.name],,, #endif]) dnl Check for stat.st_blocks and ns-resolved times -AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_mtimespec,struct stat.st_ctim,struct stat.st_ctimespec,struct stat.st_atim,struct stat.st_atimespec]) +AC_CHECK_MEMBERS([ + struct stat.st_blocks, + struct stat.st_mtim, + struct stat.st_mtimespec, + struct stat.st_ctim, + struct stat.st_ctimespec, + struct stat.st_atim, + struct stat.st_atimespec, + struct stat.st_birthtime, + struct stat.st_birthtim, + struct stat.st_birthtimespec, + struct stat.__st_birthtime, + struct stat.__st_birthtim]) dnl Check for sin6_scope_id AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ccf5933..93695f0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1648,7 +1648,21 @@ static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, #elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC) atime->QuadPart += st->st_atimespec.tv_nsec / 100; #endif +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + RtlSecondsSince1970ToTime( st->st_birthtime, creation ); +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIM + creation->QuadPart += st->st_birthtim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) + creation->QuadPart += st->st_birthtimespec.tv_nsec / 100; +#endif +#elif defined(HAVE_STRUCT_STAT___ST_BIRTHTIME) + RtlSecondsSince1970ToTime( st->__st_birthtime, creation ); +#ifdef HAVE_STRUCT_STAT___ST_BIRTHTIM + creation->QuadPart += st->__st_birthtim.tv_nsec / 100; +#endif +#else *creation = *mtime; +#endif } /* fill in the file information that depends on the stat info */ diff --git a/include/config.h.in b/include/config.h.in index f22c5eb..0081c25 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -860,6 +860,15 @@ /* Define to 1 if `st_atimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMESPEC +/* Define to 1 if `st_birthtim' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIM + +/* Define to 1 if `st_birthtime' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIME + +/* Define to 1 if `st_birthtimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC + /* Define to 1 if `st_blocks' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS @@ -875,6 +884,12 @@ /* Define to 1 if `st_mtimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIMESPEC +/* Define to 1 if `__st_birthtim' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT___ST_BIRTHTIM + +/* Define to 1 if `__st_birthtime' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT___ST_BIRTHTIME + /* Define to 1 if `tcps_connattempt' is a member of `struct tcpstat'. */ #undef HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT

1 0

Charles Davis : ntdll: Add support for nanosecond precision file times on *BSD.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: ed5e0a6e4127ff0acacef01708d8d9d6ef0d6a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5e0a6e4127ff0acacef0170… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Nov 29 21:50:45 2012 -0700 ntdll: Add support for nanosecond precision file times on *BSD. --- configure | 27 +++++++++++++++++++++++++++ configure.ac | 2 +- dlls/ntdll/file.c | 10 ++++++++++ include/config.h.in | 9 +++++++++ 4 files changed, 47 insertions(+), 1 deletions(-) diff --git a/configure b/configure index b437a78..638ddfb 100755 --- a/configure +++ b/configure @@ -14132,6 +14132,15 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec" "ac_cv_member_struct_stat_st_mtimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_mtimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_MTIMESPEC 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct stat" "st_ctim" "ac_cv_member_struct_stat_st_ctim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_ctim" = xyes; then : @@ -14141,6 +14150,15 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_ctimespec" "ac_cv_member_struct_stat_st_ctimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_ctimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_CTIMESPEC 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct stat" "st_atim" "ac_cv_member_struct_stat_st_atim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_atim" = xyes; then : @@ -14150,6 +14168,15 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec" "ac_cv_member_struct_stat_st_atimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_atimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_ATIMESPEC 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef HAVE_SYS_TYPES_H diff --git a/configure.ac b/configure.ac index 8e6a70f..5d2b4f4 100644 --- a/configure.ac +++ b/configure.ac @@ -2269,7 +2269,7 @@ AC_CHECK_MEMBERS([struct option.name],,, #endif]) dnl Check for stat.st_blocks and ns-resolved times -AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_ctim,struct stat.st_atim]) +AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_mtimespec,struct stat.st_ctim,struct stat.st_ctimespec,struct stat.st_atim,struct stat.st_atimespec]) dnl Check for sin6_scope_id AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index da5be8e..ccf5933 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1594,9 +1594,13 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ tv[1].tv_sec = st.st_mtime; #ifdef HAVE_STRUCT_STAT_ST_ATIM tv[0].tv_usec = st.st_atim.tv_nsec / 1000; +#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC) + tv[0].tv_usec = st.st_atimespec.tv_nsec / 1000; #endif #ifdef HAVE_STRUCT_STAT_ST_MTIM tv[1].tv_usec = st.st_mtim.tv_nsec / 1000; +#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC) + tv[1].tv_usec = st.st_mtimespec.tv_nsec / 1000; #endif } } @@ -1631,12 +1635,18 @@ static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, RtlSecondsSince1970ToTime( st->st_atime, atime ); #ifdef HAVE_STRUCT_STAT_ST_MTIM mtime->QuadPart += st->st_mtim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC) + mtime->QuadPart += st->st_mtimespec.tv_nsec / 100; #endif #ifdef HAVE_STRUCT_STAT_ST_CTIM ctime->QuadPart += st->st_ctim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_CTIMESPEC) + ctime->QuadPart += st->st_ctimespec.tv_nsec / 100; #endif #ifdef HAVE_STRUCT_STAT_ST_ATIM atime->QuadPart += st->st_atim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC) + atime->QuadPart += st->st_atimespec.tv_nsec / 100; #endif *creation = *mtime; } diff --git a/include/config.h.in b/include/config.h.in index 4b3a5d2..f22c5eb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -857,15 +857,24 @@ /* Define to 1 if `st_atim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIM +/* Define to 1 if `st_atimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_ATIMESPEC + /* Define to 1 if `st_blocks' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS /* Define to 1 if `st_ctim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_CTIM +/* Define to 1 if `st_ctimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_CTIMESPEC + /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM +/* Define to 1 if `st_mtimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_MTIMESPEC + /* Define to 1 if `tcps_connattempt' is a member of `struct tcpstat'. */ #undef HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT

1 0

Hans Leidekker : advapi32: Export more tracing functions.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d008771bd24ed8506c0542e773595dee944b0cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d008771bd24ed8506c0542e77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 30 10:43:00 2012 +0100 advapi32: Export more tracing functions. --- dlls/advapi32/advapi32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0cb3e15..21357fa 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,9 +351,9 @@ @ stub GetSiteSidFromToken # @ stub GetThreadWaitChain @ stdcall GetTokenInformation(long long ptr long ptr) -# @ stub GetTraceEnableFlags -# @ stub GetTraceEnableLevel -# @ stub GetTraceLoggerHandle +@ stub GetTraceEnableFlags +@ stub GetTraceEnableLevel +@ stub GetTraceLoggerHandle @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) @ stdcall GetTrusteeNameA(ptr)

1 0

Alistair Leslie-Hughes : oleaut32: Fail if we cannot find the TYPELIB resource.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 04d3ba5b35c133852fb368caa3da998868a332e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d3ba5b35c133852fb368caa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 30 21:11:07 2012 +1100 oleaut32: Fail if we cannot find the TYPELIB resource. --- dlls/oleaut32/typelib.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 83ea7e1..fa9b050 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2509,6 +2509,7 @@ static const IUnknownVtbl TLB_PEFile_Vtable = static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile) { TLB_PEFile *This; + HRESULT hr = TYPE_E_CANTLOADLIBRARY; This = heap_alloc(sizeof(TLB_PEFile)); if (!This) @@ -2543,11 +2544,13 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return S_OK; } } + + hr = E_FAIL; } } TLB_PEFile_Release((IUnknown *)&This->lpvtbl); - return TYPE_E_CANTLOADLIBRARY; + return hr; } typedef struct TLB_NEFile @@ -2946,6 +2949,8 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TYPE_E_CANTLOADLIBRARY; IUnknown_Release(pFile); } + else + ret = TYPE_E_CANTLOADLIBRARY; if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib;

1 0

Jason Edmeades : cmd: Wait for command to complete when spawned through cmd /c.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 64d7151669faccf09c845112c71a906587629ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d7151669faccf09c845112c… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Nov 29 23:23:25 2012 +0000 cmd: Wait for command to complete when spawned through cmd /c. --- programs/cmd/wcmdmain.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cb9fab6..e373d19 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1201,8 +1201,10 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (!assumeInternal && !console) errorlevel = 0; else { - /* Always wait when called in a batch program context */ - if (assumeInternal || context || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE); + /* Always wait when non-interactive (cmd /c or in batch program), + or for console applications */ + if (assumeInternal || !interactive || !HIWORD(console)) + WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0; }

1 0

Detlef Riekenberg : d3dx9_36/tests: Fix broken line test.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 8b98b6a532056b506b3a3734c6cd54d5246d5490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b98b6a532056b506b3a3734c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 30 00:25:31 2012 +0100 d3dx9_36/tests: Fix broken line test. --- dlls/d3dx9_36/tests/line.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index dc0c747..891de5a 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -109,8 +109,7 @@ static void test_create_line(IDirect3DDevice9* device) ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); expect_mat(&world, &result); - ref = IDirect3DDevice9_Release(return_device); - ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device); + IDirect3DDevice9_Release(return_device); ref = ID3DXLine_Release(line); ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line);

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 1a97bba65f2a0c6316b215988ea0847acd681e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a97bba65f2a0c6316b215988… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:50:56 2012 +0000 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp70/msvcp70.spec | 8 ++++---- dlls/msvcp71/msvcp71.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 307af74..26dbbe7 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4309,11 +4309,11 @@ # extern _Xbig @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen # msvcrt.mbrlen -@ stub mbrtowc # msvcrt.mbrtowc -@ stub mbsrtowcs # msvcrt.mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen # msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc # msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs # msvcrt.mbsrtowcs @ cdecl towctrans(long long) -@ stub wcrtomb # msvcrt.wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb # msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index ce079c2..c3856fb 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5098,11 +5098,11 @@ # extern _Zero @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ cdecl towctrans(long long) msvcp90.towctrans -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) msvcp90.wctrans diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 58636c2..70e659f 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5158,11 +5158,11 @@ # extern _Zero @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ cdecl towctrans(long long) -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e2a9f4..b970fb9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1731,9 +1731,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1841,7 +1841,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3644345..c6341c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1381,9 +1381,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1483,7 +1483,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e0cb400..3545dd1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1384,9 +1384,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1494,7 +1494,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s

1 0

Piotr Caban : msvcp70: Forward bad_cast functions to msvcrt.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: a62158eb2923542b94bc4aeb13632d0f49a60503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62158eb2923542b94bc4aeb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:50:30 2012 +0000 msvcp70: Forward bad_cast functions to msvcrt. --- dlls/msvcp70/msvcp70.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 401032e..ce079c2 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -447,10 +447,10 @@ @ stub -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z @ stub -arch=win32 ??0__non_rtti_object@std@@QAE@PBD@Z @ stub -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z -@ stub -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z -@ stub -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z -@ stub -arch=win32 ??0bad_cast@std@@QAE@PBD@Z -@ stub -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z +@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE@PBD@Z +@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA@PEBD@Z @ stub -arch=win32 ??0bad_typeid@std@@QAE@ABV01@@Z @ stub -arch=win64 ??0bad_typeid@std@@QEAA@AEBV01@@Z @ stub -arch=win32 ??0bad_typeid@std@@QAE@PBD@Z @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ??1_Winit@std@@QEAA@XZ(ptr) msvcp90.??1_Winit@std@@QEAA@XZ @ stub -arch=win32 ??1__non_rtti_object@std@@UAE@XZ @ stub -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ -@ stub -arch=win32 ??1bad_cast@std@@UAE@XZ -@ stub -arch=win64 ??1bad_cast@std@@UEAA@XZ +@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ +@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ @ stub -arch=win32 ??1bad_typeid@std@@UAE@XZ @ stub -arch=win64 ??1bad_typeid@std@@UEAA@XZ @ thiscall -arch=win32 ??1codecvt_base@std@@UAE@XZ(ptr) msvcp90.??1codecvt_base@std@@UAE@XZ @@ -813,8 +813,8 @@ @ cdecl -arch=win64 ??4_Winit@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcp90.??4_Winit@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z -@ stub -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z -@ stub -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z @ thiscall -arch=win32 ??4ios_base@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcp90.??4ios_base@std@@QAEAAV01@ABV01@@Z @@ -1727,8 +1727,8 @@ @ cdecl -arch=win64 ??_F_Locinfo@std@@QEAAXXZ(ptr) msvcp90.??_F_Locinfo@std@@QEAAXXZ @ thiscall -arch=win32 ??_F_Timevec@std@@QAEXXZ(ptr) msvcp90.??_F_Timevec@std@@QAEXXZ @ cdecl -arch=win64 ??_F_Timevec@std@@QEAAXXZ(ptr) msvcp90.??_F_Timevec@std@@QEAAXXZ -@ stub -arch=win32 ??_Fbad_cast@std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast@std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid@std@@QAEXXZ @ stub -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ @ thiscall -arch=win32 ??_Fcodecvt_base@std@@QAEXXZ(ptr) msvcp90.??_Fcodecvt_base@std@@QAEXXZ

1 0

Piotr Caban : msvcrt: Added wcrtomb tests.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d677bda97408d05a7b4781d782b6d1e5a8c2d640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d677bda97408d05a7b4781d78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:49:58 2012 +0000 msvcrt: Added wcrtomb tests. --- dlls/msvcrt/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 840c4de..d606ebb 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -85,6 +85,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); @@ -2301,6 +2302,44 @@ static void test_wctob(void) ret = p_wctob(0xe0); ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } +static void test_wctomb(void) +{ + mbstate_t state; + unsigned char dst[10]; + size_t ret; + + if(!p_wcrtomb || !setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("wcrtomb tests\n"); + return; + } + + ret = p_wcrtomb(NULL, 0x3042, NULL); + ok(ret == 2, "wcrtomb did not return 2\n"); + + state = 1; + dst[2] = 'a'; + ret = p_wcrtomb((char*)dst, 0x3042, &state); + ok(ret == 2, "wcrtomb did not return 2\n"); + ok(state == 0, "state != 0\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa0, "dst[1] = %x, expected 0xa0\n", dst[1]); + ok(dst[2] == 'a', "dst[2] != 'a'\n"); + + ret = p_wcrtomb((char*)dst, 0x3043, NULL); + ok(ret == 2, "wcrtomb did not return 2\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa1, "dst[1] = %x, expected 0xa1\n", dst[1]); + + ret = p_wcrtomb((char*)dst, 0x20, NULL); + ok(ret == 1, "wcrtomb did not return 1\n"); + ok(dst[0] == 0x20, "dst[0] = %x, expected 0x20\n", dst[0]); + + ret = p_wcrtomb((char*)dst, 0xffff, NULL); + ok(ret == -1, "wcrtomb did not return -1\n"); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x20\n", dst[0]); + + setlocale(LC_ALL, "C"); +} static void test_tolower(void) { @@ -2376,6 +2415,7 @@ START_TEST(string) p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); + p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); @@ -2427,5 +2467,6 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_wctomb(); test_tolower(); }

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 November 2012