December 2011 - Wine-commits

Jacek Caban : winebrowser: Use IUri API for URL-related logic.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: dd7c38d044ce28626dfc1f04500c3f9fdc6eb8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7c38d044ce28626dfc1f045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 16:36:33 2011 +0100 winebrowser: Use IUri API for URL-related logic. --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 183 ++++++++++++++++++-------------------- 2 files changed, 87 insertions(+), 98 deletions(-) diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index 0dee070..a2e2793 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = winebrowser.exe APPMODE = -mwindows -municode -IMPORTS = shlwapi user32 advapi32 +IMPORTS = urlmon oleaut32 user32 advapi32 C_SRCS = \ main.c diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 8635ad2..9e94fd5 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -36,6 +36,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define COBJMACROS #include "config.h" #include "wine/port.h" @@ -66,15 +67,6 @@ static char *strdup_unixcp( const WCHAR *str ) return ret; } -static WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) - strcpyW( dst, src ); - return dst; -} - /* try to launch a unix app from a comma separated string of app names */ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) { @@ -316,6 +308,58 @@ done: return ret; } +static IUri *convert_file_uri(IUri *uri) +{ + wine_get_unix_file_name_t wine_get_unix_file_name_ptr; + IUriBuilder *uri_builder; + struct stat dummy; + WCHAR *new_path; + char *unixpath; + BSTR filename; + IUri *new_uri; + HRESULT hres; + + /* check if the argument is a local file */ + wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t) + GetProcAddress( GetModuleHandleA( "KERNEL32" ), "wine_get_unix_file_name" ); + if(!wine_get_unix_file_name_ptr) + return NULL; + + hres = IUri_GetPath(uri, &filename); + if(FAILED(hres)) + return NULL; + + unixpath = wine_get_unix_file_name_ptr(filename); + SysFreeString(filename); + if(unixpath && stat(unixpath, &dummy) >= 0) { + int len; + + len = MultiByteToWideChar(CP_UNIXCP, 0, unixpath, -1, NULL, 0); + new_path = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if(new_path) + MultiByteToWideChar(CP_UNIXCP, 0, unixpath, -1, new_path, len); + HeapFree(GetProcessHeap(), 0, unixpath); + }else { + WINE_WARN("File %s does not exist\n", wine_dbgstr_a(unixpath)); + HeapFree(GetProcessHeap(), 0, unixpath); + new_path = NULL; + } + + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); + if(SUCCEEDED(hres) && new_path) + hres = IUriBuilder_SetPath(uri_builder, new_path); + HeapFree(GetProcessHeap(), 0, new_path); + if(FAILED(hres)) + return NULL; + + hres = IUriBuilder_CreateUri(uri_builder, 0, 0, 0, &new_uri); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NULL; + + return new_uri; +} + /***************************************************************************** * Main entry point. This is a console application so we have a wmain() not a * winmain(). @@ -323,11 +367,12 @@ done: int wmain(int argc, WCHAR *argv[]) { static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; - static const WCHAR mailtoW[] = {'m','a','i','l','t','o',':',0}; - static const WCHAR fileW[] = {'f','i','l','e',':',0}; - WCHAR *p, *filenameW = NULL, *fileurlW = NULL, *url = argv[1]; - wine_get_unix_file_name_t wine_get_unix_file_name_ptr; + WCHAR *url = argv[1]; + BSTR display_uri; + DWORD scheme; + IUri *uri; + HRESULT hres; int ret = 1; /* DDE used only if -nohome is specified; avoids delay in printing usage info @@ -335,103 +380,47 @@ int wmain(int argc, WCHAR *argv[]) if (url && !strcmpiW( url, nohomeW )) url = argc > 2 ? argv[2] : get_url_from_dde(); - if (!url) - { + if (!url) { WINE_ERR( "Usage: winebrowser URL\n" ); - goto done; + return -1; } - /* handle an RFC1738 file URL */ - if (!strncmpiW( url, fileW, 5 )) - { - DWORD len = strlenW( url ) + 1; - - if (UrlUnescapeW( url, NULL, &len, URL_UNESCAPE_INPLACE ) != S_OK) - { - WINE_ERR( "unescaping URL failed: %s\n", wine_dbgstr_w(url) ); - goto done; - } - - /* look for a Windows path after 'file:' */ - p = url + 5; - while (*p) - { - if (isalphaW( p[0] ) && (p[1] == ':' || p[1] == '|')) break; - p++; - } - if (!*p) - { - WINE_ERR( "no valid Windows path in: %s\n", wine_dbgstr_w(url) ); - goto done; - } - - if (p[1] == '|') p[1] = ':'; - url = p; - - while (*p) - { - if (*p == '/') *p = '\\'; - p++; - } + hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) { + WINE_ERR("Failed to parse URL\n"); + ret = open_http_url(url); + HeapFree(GetProcessHeap(), 0, ddeString); + return ret; } - /* check if the argument is a local file */ - wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t) - GetProcAddress( GetModuleHandleA( "KERNEL32" ), "wine_get_unix_file_name" ); + HeapFree(GetProcessHeap(), 0, ddeString); + IUri_GetScheme(uri, &scheme); - if (wine_get_unix_file_name_ptr == NULL) - { - WINE_ERR( "cannot get the address of 'wine_get_unix_file_name'\n" ); - } - else - { - char *unixpath; - WCHAR c = 0; + if(scheme == URL_SCHEME_FILE) { + IUri *file_uri; - if (!(filenameW = strdupW( url ))) goto done; - if ((p = strchrW( filenameW, '?' )) || (p = strchrW( filenameW, '#' ))) - { - c = *p; - *p = 0; + file_uri = convert_file_uri(uri); + if(file_uri) { + IUri_Release(uri); + uri = file_uri; + }else { + WINE_ERR("Failed to convert file URL to unix path\n"); } + } - if ((unixpath = wine_get_unix_file_name_ptr( filenameW ))) - { - struct stat dummy; - if (stat( unixpath, &dummy ) >= 0) - { - static const WCHAR schemeW[] = {'f','i','l','e',':','/','/',0}; - int len, len_scheme; - - len = len_scheme = strlenW( schemeW ); - len += MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, NULL, 0 ); - if (p) - { - *p = c; - len += strlenW( p ); - } - - if (!(fileurlW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done; - - strcpyW( fileurlW, schemeW ); - MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, fileurlW + len_scheme, len - len_scheme ); - if (p) strcatW( fileurlW, p ); + hres = IUri_GetDisplayUri(uri, &display_uri); + IUri_Release(uri); + if(FAILED(hres)) + return -1; - ret = open_http_url( fileurlW ); - goto done; - } - } - } + WINE_TRACE("opening %s\n", wine_dbgstr_w(display_uri)); - if (!strncmpiW( url, mailtoW, 7 )) - ret = open_mailto_url( url ); + if(scheme == URL_SCHEME_MAILTO) + ret = open_mailto_url(display_uri); else /* let the browser decide how to handle the given url */ - ret = open_http_url( url ); + ret = open_http_url(display_uri); -done: - HeapFree(GetProcessHeap(), 0, ddeString); - HeapFree( GetProcessHeap(), 0, filenameW ); - HeapFree( GetProcessHeap(), 0, fileurlW ); + SysFreeString(display_uri); return ret; }

1 0

Alexandre Julliard : gdi32: Use the convert_bits helper function in SetDIBits and SetDIBitsToDevice.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: df9e0ccf5c7c56cdab457cb1023582a7078df2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9e0ccf5c7c56cdab457cb10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 19:53:44 2011 +0100 gdi32: Use the convert_bits helper function in SetDIBits and SetDIBitsToDevice. --- dlls/gdi32/dib.c | 33 ++++----------------------------- 1 files changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0b8bb76..ed5eea7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -680,21 +680,8 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) { - void *ptr; - - dst_info->bmiHeader.biWidth = dst.width; - ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); - if (ptr) - { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); - } - else err = ERROR_OUTOFMEMORY; + err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + if (!err) err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } if(err) result = 0; @@ -810,20 +797,8 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { - void *ptr; - - dst_info->bmiHeader.biWidth = src.visrect.right - src.visrect.left; - ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); - if (ptr) - { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); - } - else err = ERROR_OUTOFMEMORY; + err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); } if (err) lines = 0;

1 0

Alexandre Julliard : gdi32: Use PutImage directly to set the initial bitmap bits.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 910fb482916b8515a59752f64d3153a4811bb9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910fb482916b8515a59752f64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 19:58:47 2011 +0100 gdi32: Use PutImage directly to set the initial bitmap bits. --- dlls/gdi32/bitmap.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 4f0b173..510d5f5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -513,14 +513,43 @@ LONG WINAPI SetBitmapBits( static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; + char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; + char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; + DWORD err; + struct gdi_image_bits bits; + struct bitblt_coords src, dst; if (!bmp->bitmap.bmBits) return; if (bmp->funcs->pPutImage == nulldrv_PutImage) return; - get_ddb_bitmapinfo( bmp, info ); - SetDIBits( 0, hbitmap, 0, bmp->bitmap.bmHeight, bmp->bitmap.bmBits, info, DIB_RGB_COLORS ); + get_ddb_bitmapinfo( bmp, src_info ); + + bits.ptr = bmp->bitmap.bmBits; + bits.is_copy = FALSE; + bits.free = NULL; + bits.param = NULL; + + src.x = 0; + src.y = 0; + src.width = bmp->bitmap.bmWidth; + src.height = bmp->bitmap.bmHeight; + src.visrect.left = 0; + src.visrect.top = 0; + src.visrect.right = bmp->bitmap.bmWidth; + src.visrect.bottom = bmp->bitmap.bmHeight; + dst = src; + + copy_bitmapinfo( dst_info, src_info ); + + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, dst_info, &bits, &src, &dst, 0 ); + if (err == ERROR_BAD_FORMAT) + { + err = convert_bits( src_info, &src, dst_info, &bits, FALSE ); + if (!err) err = bmp->funcs->pPutImage( NULL, hbitmap, 0, dst_info, &bits, &src, &dst, 0 ); + if (bits.free) bits.free( &bits ); + } } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Don' t make a copy of the DIB color table when selecting it into a DC.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 71199eab77848feddbf3fce04d67c0f8837c8359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71199eab77848feddbf3fce04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 17:04:14 2011 +0100 gdi32: Don't make a copy of the DIB color table when selecting it into a DC. --- dlls/gdi32/dibdrv/dc.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2c61d29..b9308bf 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -422,7 +422,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) free_dib_info(&pdev->dib); pdev->defer = 0; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, 0)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); @@ -495,11 +495,8 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p, %d, %d, %p)\n", dev, pos, count, colors); - if( pdev->dib.color_table && pos < pdev->dib.color_table_size ) + if (pdev->dib.color_table) { - if( pos + count > pdev->dib.color_table_size ) count = pdev->dib.color_table_size - pos; - memcpy( pdev->dib.color_table + pos, colors, count * sizeof(RGBQUAD) ); - pdev->bkgnd_color = get_pixel_color( pdev, GetBkColor( dev->hdc ), FALSE ); update_fg_colors( pdev );

1 0

Jacek Caban : jscript: Use bytecode for array literal expressions.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 558d759465898c20135da6ed03106d454ccdf18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=558d759465898c20135da6ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:02:40 2011 +0100 jscript: Use bytecode for array literal expressions. --- dlls/jscript/compile.c | 30 ++++++++++++++++++++++ dlls/jscript/engine.c | 65 ++++++++++++++++++++---------------------------- dlls/jscript/engine.h | 3 +- dlls/jscript/parser.y | 2 +- 4 files changed, 60 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 483c9de..f0f9cc0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -570,6 +570,34 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) } } +static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expression_t *expr) +{ + unsigned i, elem_cnt = expr->length; + array_element_t *iter; + HRESULT hres; + + for(iter = expr->element_list; iter; iter = iter->next) { + elem_cnt += iter->elision+1; + + for(i=0; i < iter->elision; i++) { + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + } + + hres = compile_expression(ctx, iter->expr); + if(FAILED(hres)) + return hres; + } + + for(i=0; i < expr->length; i++) { + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + } + + return push_instr_uint(ctx, OP_carray, elem_cnt); +} + + static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, BOOL *no_ret) { switch(expr->type) { @@ -579,6 +607,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); case EXPR_ARRAY: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array); + case EXPR_ARRAYLIT: + return compile_array_literal(ctx, (array_literal_expression_t*)expr); case EXPR_ASSIGN: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); case EXPR_ASSIGNADD: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 467d686..f72ee42 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2001,54 +2001,33 @@ static HRESULT interp_regexp(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.1.4 */ -HRESULT array_literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_carray(exec_ctx_t *ctx) { - array_literal_expression_t *expr = (array_literal_expression_t*)_expr; - DWORD length = 0, i = 0; - array_element_t *elem; + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; jsdisp_t *array; - exprval_t exprval; - VARIANT val; + VARIANT *v, r; + unsigned i; HRESULT hres; - TRACE("\n"); - - for(elem = expr->element_list; elem; elem = elem->next) - length += elem->elision+1; - length += expr->length; + TRACE("%u\n", arg); - hres = create_array(ctx, length, &array); + hres = create_array(ctx->parser->script, arg, &array); if(FAILED(hres)) return hres; - for(elem = expr->element_list; elem; elem = elem->next) { - i += elem->elision; - - hres = expr_eval(ctx, elem->expr, 0, ei, &exprval); - if(FAILED(hres)) - break; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - break; - - hres = jsdisp_propput_idx(array, i, &val, ei, NULL/*FIXME*/); - VariantClear(&val); - if(FAILED(hres)) - break; - - i++; - } - - if(FAILED(hres)) { - jsdisp_release(array); - return hres; + i = arg; + while(i--) { + v = stack_pop(ctx); + hres = jsdisp_propput_idx(array, i, v, &ctx->ei, NULL/*FIXME*/); + VariantClear(v); + if(FAILED(hres)) { + jsdisp_release(array); + return hres; + } } - ret->type = EXPRVAL_VARIANT; - var_set_jsdisp(&ret->u.var, array); - return S_OK; + var_set_jsdisp(&r, array); + return stack_push(ctx, &r); } /* ECMA-262 3rd Edition 11.1.5 */ @@ -3270,6 +3249,16 @@ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); } +static HRESULT interp_undefined(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_EMPTY; + return stack_push(ctx, &v); +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dab692f..4bee824 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -49,6 +49,7 @@ typedef struct _func_stack { X(bneg, 1, 0,0) \ X(call, 1, ARG_UINT, ARG_UINT) \ X(call_member,1, ARG_UINT, ARG_UINT) \ + X(carray, 1, ARG_UINT, 0) \ X(delete, 1, 0,0) \ X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ @@ -88,6 +89,7 @@ typedef struct _func_stack { X(refval, 1, 0,0) \ X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ + X(undefined, 1, 0,0) \ X(void, 1, 0,0) \ X(xor, 1, 0,0) @@ -557,7 +559,6 @@ HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,e HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 4fbd678..e7eadfa 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1359,7 +1359,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, function_expression_eval, identifier_expression_eval, - array_literal_expression_eval, + compiled_expression_eval, property_value_expression_eval, compiled_expression_eval };

1 0

Jacek Caban : jscript: Use bytecode for binary and implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 1ef486421ed94e54094545e391f864701ece9cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef486421ed94e54094545e39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:02:53 2011 +0100 jscript: Use bytecode for binary and implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f0f9cc0..9e1ed6a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_ASSIGNXOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); + case EXPR_BAND: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f72ee42..50aab41 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2184,13 +2184,22 @@ static HRESULT bitand_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsex } /* ECMA-262 3rd Edition 11.10 */ -HRESULT binary_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_and(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + INT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, bitand_eval, ei, ret); + hres = stack_pop_int(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l&r); } /* ECMA-262 3rd Edition 11.8.6 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4bee824..582bc1f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,6 +43,7 @@ typedef struct _func_stack { #define OP_LIST \ X(add, 1, 0,0) \ + X(and, 1, 0,0) \ X(array, 1, 0,0) \ X(assign, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ @@ -561,7 +562,6 @@ HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index e7eadfa..2d8361c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1309,7 +1309,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - binary_and_expression_eval, + compiled_expression_eval, instanceof_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '&=' expression implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: fc4948af2c1de60fd1c8d5587bf40749313e5515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4948af2c1de60fd1c8d5587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:03:09 2011 +0100 jscript: Use bytecode for '&=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ----------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9e1ed6a..0acf483 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -613,6 +613,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); case EXPR_ASSIGNADD: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_add); + case EXPR_ASSIGNAND: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_ASSIGNSUB: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_ASSIGNMUL: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 50aab41..81033f2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2165,25 +2165,6 @@ static HRESULT interp_xor(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.10 */ -static HRESULT bitand_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - INT li, ri; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_int32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li&ri; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.10 */ static HRESULT interp_and(exec_ctx_t *ctx) { INT l, r; @@ -3248,16 +3229,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); -} - static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 582bc1f..9758377 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -571,7 +571,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 2d8361c..6a97307 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1348,7 +1348,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_and_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '>>' expression.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 28013dfa6faf4655d653c22ae5349d4b5a3cdca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28013dfa6faf4655d653c22ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:03:22 2011 +0100 jscript: Use bytecode for '>>' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 23 +++++++++++++++++++++++ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0acf483..2fa7275 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -689,6 +689,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, -1); case EXPR_PREINC: return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1); + case EXPR_RSHIFT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_rshift); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 81033f2..f6b9762 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -174,6 +174,11 @@ static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); } +static inline HRESULT stack_pop_uint(exec_ctx_t *ctx, DWORD *r) +{ + return to_uint32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); +} + static inline IDispatch *stack_pop_objid(exec_ctx_t *ctx, DISPID *id) { assert(V_VT(stack_top(ctx)) == VT_INT && V_VT(stack_topn(ctx, 1)) == VT_DISPATCH); @@ -3135,6 +3140,24 @@ static HRESULT rshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsex } /* ECMA-262 3rd Edition 11.7.2 */ +static HRESULT interp_rshift(exec_ctx_t *ctx) +{ + DWORD r; + INT l; + HRESULT hres; + + hres = stack_pop_uint(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l >> (r&0x1f)); +} + +/* ECMA-262 3rd Edition 11.7.2 */ HRESULT right_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 9758377..504462c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -82,6 +82,7 @@ typedef struct _func_stack { X(postinc, 1, ARG_INT, 0) \ X(preinc, 1, ARG_INT, 0) \ X(regexp, 1, ARG_STR, ARG_INT) \ + X(rshift, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ X(throw, 0, ARG_UINT, 0) \ @@ -566,7 +567,6 @@ HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6a97307..5d42ef0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1337,7 +1337,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, left_shift_expression_eval, - right_shift_expression_eval, + compiled_expression_eval, right2_shift_expression_eval, compiled_expression_eval, assign_lshift_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '>>=' expression.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: d30bfb6e54d8d0f62606328d1e83885efa6c1e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30bfb6e54d8d0f62606328d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:03:35 2011 +0100 jscript: Use bytecode for '>>=' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 40 ---------------------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2fa7275..d733c33 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_ASSIGNOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); + case EXPR_ASSIGNRSHIFT: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift); case EXPR_ASSIGNXOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); case EXPR_BAND: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f6b9762..63ae9d7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3120,26 +3120,6 @@ HRESULT left_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.7.2 */ -static HRESULT rshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - DWORD ri; - INT li; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li >> (ri&0x1f); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.7.2 */ static HRESULT interp_rshift(exec_ctx_t *ctx) { DWORD r; @@ -3157,16 +3137,6 @@ static HRESULT interp_rshift(exec_ctx_t *ctx) return stack_push_int(ctx, l >> (r&0x1f)); } -/* ECMA-262 3rd Edition 11.7.2 */ -HRESULT right_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return binary_expr_eval(ctx, expr, rshift_eval, ei, ret); -} - /* ECMA-262 3rd Edition 11.7.3 */ static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { @@ -3233,16 +3203,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DW } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_rshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 504462c..dc7f6ac 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -569,7 +569,6 @@ HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5d42ef0..3322206 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1341,7 +1341,7 @@ static const expression_eval_t expression_eval_table[] = { right2_shift_expression_eval, compiled_expression_eval, assign_lshift_expression_eval, - assign_rshift_expression_eval, + compiled_expression_eval, assign_rrshift_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Piotr Caban : msvcp90: Added _Getcvt implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 56c1c75b7282c717a41819ee99c6781368a7bf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c1c75b7282c717a41819ee9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:05 2011 +0100 msvcp90: Added _Getcvt implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2fd3bd1..a668d18 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -897,14 +897,26 @@ _Ctypevec __thiscall _Locinfo__Getctype(const _Locinfo *this) return _Getctype(); } +/* _Getcvt */ +_Cvtvec __cdecl _Getcvt(void) +{ + _Cvtvec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_codepage; + ret.handle = locale->locinfo->lc_handle[LC_CTYPE]; + _free_locale(locale); + return ret; +} + /* ?_Getcvt(a)_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ /* ?_Getcvt(a)_Locinfo@std@@QEBA?AU_Cvtvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 4) _Cvtvec __thiscall _Locinfo__Getcvt(const _Locinfo *this) { - _Cvtvec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getcvt(); } /* ?_Getdateorder(a)_Locinfo@std@@QBEHXZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index bcaaa1c..1f7ef62 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5752,7 +5752,7 @@ # extern _FXbig @ cdecl _Getcoll() @ cdecl _Getctype() -@ stub _Getcvt +@ cdecl _Getcvt() @ stub _Getdateorder @ stub _Getwctype @ stub _Getwctypes

1 0