April 2012 - Wine-commits - list.winehq.org

Hans Leidekker : msi/tests: Fix some leaks.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 2b9be70975729b402d608a5986f8756cf16d717a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9be70975729b402d608a598… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 20 10:56:27 2012 +0200 msi/tests: Fix some leaks. --- dlls/msi/tests/msi.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 67b7e52..c0ca658 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11819,7 +11819,7 @@ static void test_MsiEnumProductsEx(void) char product0[39], product1[39], product2[39], product3[39], guid[39], sid[128]; char product_squashed1[33], product_squashed2[33], product_squashed3[33]; char keypath1[MAX_PATH], keypath2[MAX_PATH], keypath3[MAX_PATH]; - HKEY key1, key2, key3; + HKEY key1 = NULL, key2 = NULL, key3 = NULL; REGSAM access = KEY_ALL_ACCESS; char *usersid = get_user_sid(); @@ -11837,8 +11837,7 @@ static void test_MsiEnumProductsEx(void) if (r == ERROR_ACCESS_DENIED) { skip( "insufficient rights\n" ); - LocalFree( usersid ); - return; + goto done; } ok( r == ERROR_SUCCESS, "got %u\n", r ); @@ -11919,8 +11918,7 @@ static void test_MsiEnumProductsEx(void) if (r == ERROR_ACCESS_DENIED) { skip( "insufficient rights\n" ); - LocalFree( usersid ); - return; + goto done; } ok( r == ERROR_SUCCESS, "got %u\n", r ); ok( guid[0], "empty guid\n" ); @@ -11960,6 +11958,7 @@ static void test_MsiEnumProductsEx(void) len = sizeof(sid); } +done: delete_key( key1, "", access ); delete_key( key2, "", access ); delete_key( key3, "", access );

1 0

Hans Leidekker : msi: Remove an unneeded assignment.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: a7137ef0357dba1611f7da11a3f4672ac0c1364f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7137ef0357dba1611f7da11a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 20 10:56:46 2012 +0200 msi: Remove an unneeded assignment. --- dlls/msi/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 31e7b4f..4143a79 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -2363,7 +2363,7 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD } strcpyW( path, user ); strcatW( path, subkey ); - if ((r = RegOpenKeyExW( key_users, path, 0, access, &key_products ))) + if (RegOpenKeyExW( key_users, path, 0, access, &key_products )) { i++; len_user = sizeof(user)/sizeof(user[0]);

1 0

Jacek Caban : jscript: Added regexp 'pre-parser' to support non-backslash-sequenced non-terminating '/' in characted classes.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 4733fd062391a2d975771df53cdda058141dbc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4733fd062391a2d975771df53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 11:08:08 2012 +0200 jscript: Added regexp 'pre-parser' to support non-backslash-sequenced non-terminating '/' in characted classes. --- dlls/jscript/lex.c | 26 +++++++++++++++++++++----- dlls/jscript/tests/regexp.js | 6 ++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 42e482f..6842b58 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -957,6 +957,7 @@ int parser_lex(void *lval, parser_ctx_t *ctx) literal_t *parse_regexp(parser_ctx_t *ctx) { const WCHAR *re, *flags_ptr; + BOOL in_class = FALSE; DWORD re_len, flags; literal_t *ret; HRESULT hres; @@ -965,14 +966,29 @@ literal_t *parse_regexp(parser_ctx_t *ctx) while(*--ctx->ptr != '/'); + /* Simple regexp pre-parser; '/' if used in char class does not terminate regexp literal */ re = ++ctx->ptr; - while(ctx->ptr < ctx->end && *ctx->ptr != '/') { - if(*ctx->ptr++ == '\\' && ctx->ptr < ctx->end) - ctx->ptr++; + while(ctx->ptr < ctx->end) { + if(*ctx->ptr == '\\') { + if(++ctx->ptr == ctx->end) + break; + }else if(in_class) { + if(*ctx->ptr == '\n') + break; + if(*ctx->ptr == ']') + in_class = FALSE; + }else { + if(*ctx->ptr == '/') + break; + + if(*ctx->ptr == '[') + in_class = TRUE; + } + ctx->ptr++; } - if(ctx->ptr == ctx->end) { - WARN("unexpected end of file\n"); + if(ctx->ptr == ctx->end || *ctx->ptr != '/') { + WARN("pre-parsing failed\n"); return NULL; } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index d553bb6..7b363dd 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -592,4 +592,10 @@ ok(tmp === "xxx", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); tmp = "xxx".replace(/^\s*|\s*$/g, "y"); ok(tmp === "yxxxy", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); +tmp = "x/y".replace(/[/]/, "*"); +ok(tmp === "x*y", '"x/y".replace(/[/]/, "*") = ' + tmp); + +tmp = "x/y".replace(/[xy/]/g, "*"); +ok(tmp === "***", '"x/y".replace(/[xy/]/, "*") = ' + tmp); + reportSuccess();

1 0

Jacek Caban : mshtml: Ignore dispid 3000026 in IPropertyNotifySink:: OnChanged tests.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 1c07d166f12361f41c4e1ba2c86979291464cb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c07d166f12361f41c4e1ba2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 11:31:46 2012 +0200 mshtml: Ignore dispid 3000026 in IPropertyNotifySink::OnChanged tests. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 417d952..a486f3f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -937,6 +937,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000023: case 3000024: case 3000025: + case 3000026: case 3000028: case 3000029: case 3000030:

1 0

Francois Gouget : d3drm/tests: Make object_load_callback() static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 118ea982f1dd8b2279cd4d0449701ec2c33de363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118ea982f1dd8b2279cd4d044… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:39:47 2012 +0200 d3drm/tests: Make object_load_callback() static. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 91e1c76..36ae19d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -613,7 +613,7 @@ static const GUID* refiids[] = &IID_IDirect3DRMFrame }; -void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) +static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) { ok(object != NULL, "Arg 1 should not be null\n"); ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 should is incorrect\n");

1 0

Francois Gouget : quartz: Mark a bunch of functions as static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: a3da9a7ab4431433e7f1113b2e0f13364eff66ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3da9a7ab4431433e7f1113b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:39:55 2012 +0200 quartz: Mark a bunch of functions as static. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/main.c | 2 +- dlls/quartz/videorenderer.c | 22 +++++++++++----------- dlls/quartz/vmr9.c | 22 +++++++++++----------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3bbe12d..5d6dac2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -340,7 +340,7 @@ static HRESULT WINAPI DSoundRender_ShouldDrawSampleNow(BaseRenderer *This, IMedi } -HRESULT WINAPI DSoundRender_PrepareReceive(BaseRenderer *iface, IMediaSample *pSample) +static HRESULT WINAPI DSoundRender_PrepareReceive(BaseRenderer *iface, IMediaSample *pSample) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); HRESULT hr; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 6488b7e..a75a794 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -37,7 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return QUARTZ_DllMain( hInstDLL, fdwReason, lpv ); } -HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) +static HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) { return PosPassThru_Construct(pUnkOuter,ppObj); /* from strmbase */ } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 27c656c..a7b31cf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -249,7 +249,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return S_OK; } -HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) +static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) { /* Preroll means the sample isn't shown, this is used for key frames and things like that */ if (IMediaSample_IsPreroll(pSample) == S_OK) @@ -477,14 +477,14 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VideoRenderer_OnSize }; -HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) +static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(pSourceRect,&This->SourceRect); return S_OK; } -HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage) +static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); BITMAPINFOHEADER *bmiHeader; @@ -543,14 +543,14 @@ HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBuff return S_OK; } -HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) +static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(pTargetRect,&This->DestRect); return S_OK; } -VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) +static VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); AM_MEDIA_TYPE *pmt; @@ -572,7 +572,7 @@ VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) } } -HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); FIXME("(%p/%p)->(): stub !!!\n", This, iface); @@ -580,7 +580,7 @@ HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); FIXME("(%p/%p)->(): stub !!!\n", This, iface); @@ -588,7 +588,7 @@ HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); @@ -600,7 +600,7 @@ HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); RECT rect; @@ -616,14 +616,14 @@ HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_SetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) +static HRESULT WINAPI VideoRenderer_SetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(&This->SourceRect,pSourceRect); return S_OK; } -HRESULT WINAPI VideoRenderer_SetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) +static HRESULT WINAPI VideoRenderer_SetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(&This->DestRect,pTargetRect); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2f490e5..cd7429d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -202,7 +202,7 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY return S_OK; } -HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) +static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) { /* Preroll means the sample isn't shown, this is used for key frames and things like that */ if (IMediaSample_IsPreroll(pSample) == S_OK) @@ -277,14 +277,14 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VMR9_OnSize, }; -HRESULT WINAPI VMR9_GetSourceRect(BaseControlVideo* This, RECT *pSourceRect) +static HRESULT WINAPI VMR9_GetSourceRect(BaseControlVideo* This, RECT *pSourceRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(pSourceRect,&pVMR9->source_rect); return S_OK; } -HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage) +static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); BITMAPINFOHEADER *bmiHeader; @@ -343,14 +343,14 @@ HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LO return S_OK; } -HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRect) +static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(pTargetRect,&pVMR9->target_rect); return S_OK; } -VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) +static VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); AM_MEDIA_TYPE *pmt; @@ -372,7 +372,7 @@ VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) } } -HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); @@ -380,7 +380,7 @@ HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); @@ -388,7 +388,7 @@ HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); @@ -400,7 +400,7 @@ HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) { RECT rect; VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); @@ -416,14 +416,14 @@ HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_SetSourceRect(BaseControlVideo* This, RECT *pSourceRect) +static HRESULT WINAPI VMR9_SetSourceRect(BaseControlVideo* This, RECT *pSourceRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(&pVMR9->source_rect,pSourceRect); return S_OK; } -HRESULT WINAPI VMR9_SetTargetRect(BaseControlVideo* This, RECT *pTargetRect) +static HRESULT WINAPI VMR9_SetTargetRect(BaseControlVideo* This, RECT *pTargetRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(&pVMR9->target_rect,pTargetRect);

1 0

Piotr Caban : jscript: Added Number.toFixed implementation.
by Alexandre Julliard 19 Apr '12

19 Apr '12

1 0

Piotr Caban : jscript: Added Number.toExponential implementation.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: c1228eb45f5e390862b6521324bd8f2b62ff2c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1228eb45f5e390862b652132… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 15:28:59 2012 +0200 jscript: Added Number.toExponential implementation. --- dlls/jscript/number.c | 107 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 15 ++++++ 2 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 417e9ce..e1ff50c 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -150,6 +150,70 @@ static inline void number_to_fixed(double val, int prec, BSTR *out) *out = str; } +static inline void number_to_exponential(double val, int prec, BSTR *out) +{ + WCHAR buf[NUMBER_DTOA_SIZE], *pbuf; + int dec_point, size, buf_size, exp_size = 1; + BOOL neg = FALSE; + BSTR str; + + if(val < 0) { + neg = TRUE; + val = -val; + } + + buf_size = prec+2; + if(buf_size<2 || buf_size>NUMBER_DTOA_SIZE) + buf_size = NUMBER_DTOA_SIZE; + dtoa(val, buf, buf_size, &dec_point); + buf_size--; + if(prec == -1) + for(; buf_size>1 && buf[buf_size-1]=='0'; buf_size--) + buf[buf_size-1] = 0; + + size = 10; + while(dec_point>=size || dec_point<=-size) { + size *= 10; + exp_size++; + } + + if(buf_size == 1) + size = buf_size+2+exp_size; /* 2 = strlen(e+) */ + else if(prec == -1) + size = buf_size+3+exp_size; /* 3 = strlen(.e+) */ + else + size = prec+4+exp_size; /* 4 = strlen(0.e+) */ + if(neg) + size++; + str = SysAllocStringLen(NULL, size); + + size = 0; + pbuf = buf; + if(neg) + str[size++] = '-'; + str[size++] = *pbuf++; + if(buf_size != 1) { + str[size++] = '.'; + while(*pbuf) + str[size++] = *pbuf++; + for(; prec>buf_size-1; prec--) + str[size++] = '0'; + } + str[size++] = 'e'; + if(dec_point >= 0) { + str[size++] = '+'; + }else { + str[size++] = '-'; + dec_point = -dec_point; + } + for(str[size]='0', size+=exp_size-1; dec_point>0; dec_point/=10) + str[size--] = '0'+dec_point%10; + size += exp_size+1; + str[size] = 0; + + *out = str; +} + /* ECMA-262 3rd Edition 15.7.4.2 */ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) @@ -330,8 +394,47 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { - FIXME("\n"); - return E_NOTIMPL; + NumberInstance *number; + DOUBLE val; + INT prec = 0; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + if(!(number = number_this(jsthis))) + return throw_type_error(ctx, ei, JS_E_NUMBER_EXPECTED, NULL); + + if(arg_cnt(dp)) { + hres = to_int32(ctx, get_arg(dp, 0), ei, &prec); + if(FAILED(hres)) + return hres; + + if(prec<0 || prec>20) + return throw_range_error(ctx, ei, JS_E_FRACTION_DIGITS_OUT_OF_RANGE, NULL); + } + + val = number->value; + if(isinf(val) || isnan(val)) { + VARIANT v; + + num_set_val(&v, val); + hres = to_string(ctx, &v, ei, &str); + if(FAILED(hres)) + return hres; + }else { + if(!prec) + prec--; + number_to_exponential(val, prec, &str); + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + }else { + SysFreeString(str); + } + return S_OK; } static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 70b28ef..a0e23fb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1046,6 +1046,21 @@ ok(tmp === "Infinity", "num(1000000000000000128) = " + tmp); tmp = (new Number(0.12345678901234567890123)).toFixed(20); ok(tmp === "0.12345678901234568000", "num(0.12345678901234567890123) = " + tmp); +tmp = (new Number(2)).toExponential(3); +ok(tmp === "2.000e+0", "num(2).toExponential(3) = " + tmp); +tmp = (new Number(1.17e-32)).toExponential(20); +ok(tmp === "1.17000000000000000000e-32", "num(1.17e-32).toExponential(20) = " + tmp); +tmp = (new Number(0)).toExponential(7); +ok(tmp === "0.0000000e+0", "num(0).toExponential(7) = " + tmp); +tmp = (new Number(0)).toExponential(0); +ok(tmp === "0e+0", "num(0).toExponential() = " + tmp); +tmp = (new Number(-13.7567)).toExponential(); +ok(tmp === "-1.37567e+1", "num(-13.7567).toExponential() = " + tmp); +tmp = (new Number(-32.1)).toExponential(); +ok(tmp === "-3.21e+1", "num(-32.1).toExponential() = " + tmp); +tmp = (new Number(4723.4235)).toExponential(); +ok(tmp === "4.7234235e+3", "num(4723.4235).toExponential() = " + tmp); + ok(Number() === 0, "Number() = " + Number()); ok(Number(false) === 0, "Number(false) = " + Number(false)); ok(Number("43") === 43, "Number('43') = " + Number("43"));

1 0

Piotr Caban : jscript: Added Number.toPrecision implementation.
by Alexandre Julliard 19 Apr '12

19 Apr '12

1 0

Piotr Caban : wininet: Use the same hashing function as native does.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 9d68333f783b5a99a4c0d3bebd1011375919c2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d68333f783b5a99a4c0d3beb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 13:26:33 2012 +0200 wininet: Use the same hashing function as native does. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 81b9fda..e958d00 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -77,7 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_LOCK 2 #define HASHTABLE_FREE 3 #define HASHTABLE_REDR 5 -#define HASHTABLE_FLAG_BITS 4 +#define HASHTABLE_FLAG_BITS 5 #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define URL_SIGNATURE DWORD_SIG('U','R','L',' ') @@ -1228,7 +1228,7 @@ static DWORD URLCache_HashKey(LPCSTR lpszKey) DWORD i; for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) - key[i] = lookupTable[i]; + key[i] = lookupTable[(*lpszKey + i) & 0xFF]; for (lpszKey++; *lpszKey && ((lpszKey[0] != '/') || (lpszKey[1] != 0)); lpszKey++) {

1 0