April 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Kill the now unused MAX_MIP_LEVELS.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 61d8338815516d2161f6806a4f519d34bbe33abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d8338815516d2161f6806a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:32 2010 +0200 wined3d: Kill the now unused MAX_MIP_LEVELS. --- dlls/wined3d/wined3d_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 52486f5..556ceeb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -773,9 +773,6 @@ extern int num_lock DECLSPEC_HIDDEN; (vec)[3] = D3DCOLOR_A(dw); \ } while(0) -/* DirectX Device Limits */ -/* --------------------- */ -#define MAX_MIP_LEVELS 32 /* Maximum number of mipmap levels. */ #define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ /* Checking of API calls */

1 0

Piotr Caban : msvcrt: Added btowc implementation.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 815840e972fd70d2d4bfd32df5422cdc8e5ef738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815840e972fd70d2d4bfd32df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:19 2010 +0200 msvcrt: Added btowc implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0c69621..b8e89e4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1235,7 +1235,7 @@ @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ stub bsearch_s -@ stub btowc +@ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil @ cdecl clearerr(ptr) msvcrt.clearerr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3bfd1b8..141592d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1219,7 +1219,7 @@ @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ stub bsearch_s -@ stub btowc +@ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil @ cdecl clearerr(ptr) msvcrt.clearerr diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 84bd73b..546f20c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -485,6 +485,22 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * btowc(MSVCRT.@) + */ +MSVCRT_wint_t CDECL MSVCRT_btowc(int c) +{ + MSVCRT__locale_t locale = get_locale(); + unsigned char letter = c; + MSVCRT_wchar_t ret; + + if(!MultiByteToWideChar(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], + 0, (LPCSTR)&letter, 1, &ret, 1)) + return 0; + + return ret; +} + +/********************************************************************* * __crtGetStringTypeW(MSVCRT.@) * * This function was accepting different number of arguments in older diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0909cd0..156ab2e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1165,7 +1165,7 @@ @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch # stub bsearch_s -# stub btowc +@ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl clearerr(ptr) MSVCRT_clearerr

1 0

Henri Verbeet : wined3d: Add a missing newline to a TRACE in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: c56d3c199c803550d1014fb2a2c5b4a3b9ff1254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56d3c199c803550d1014fb2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:33 2010 +0200 wined3d: Add a missing newline to a TRACE in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2b20c4..0fe67a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5208,7 +5208,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, DWORD sampler; struct wined3d_format_desc dummy_desc; - TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s", + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s.\n", iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_point(dst_point));

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_internal_preload().
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: d1ea48b971e52a50e6c987cf5cc8ad668934abe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ea48b971e52a50e6c987cf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:34 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_internal_preload(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 48 ++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec8a02a..0bd613c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6906,7 +6906,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ RECT dst_rect = *dst_rect_in; /* Now load the surface */ - surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + surface_internal_preload(src_surface, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface, CTXUSAGE_BLIT); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 26c2981..ad969b8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2003,7 +2003,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI if (context->render_offscreen) { FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); @@ -2149,11 +2149,11 @@ static void context_setup_target(IWineD3DDeviceImpl *device, /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) { - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_BOTH); + surface_internal_preload(context->current_rt, SRGB_BOTH); } else { - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); } IWineD3DSurface_ModifyLocation((IWineD3DSurface *)context->current_rt, SFLAG_INDRAWABLE, FALSE); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0fe67a4..894ef2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5247,7 +5247,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, LEAVE_GL(); /* Make sure the surface is loaded and up to date */ - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_impl, SRGB_RGB); IWineD3DSurface_BindTexture(dst_surface, FALSE); src_w = src_impl->currentDesc.Width; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2180256..ddb0ac7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1071,46 +1071,49 @@ static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) IWineD3DSurface IWineD3DResource parts follow **************************************************** */ -void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) { /* TODO: check for locks */ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DDeviceImpl *device = surface->resource.device; IWineD3DBaseTexture *baseTexture = NULL; - TRACE("(%p)Checking to see if the container is a base texture\n", This); - if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) baseTexture; + TRACE("(%p)Checking to see if the container is a base texture\n", surface); + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&baseTexture))) + { + IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *)baseTexture; TRACE("Passing to container\n"); tex_impl->baseTexture.internal_preload(baseTexture, srgb); IWineD3DBaseTexture_Release(baseTexture); } else { struct wined3d_context *context = NULL; - TRACE("(%p) : About to load surface\n", This); + TRACE("(%p) : About to load surface\n", surface); if (!device->isInDraw) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) + if (surface->resource.format_desc->format == WINED3DFMT_P8_UINT + || surface->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - if(palette9_changed(This)) { + if (palette9_changed(surface)) + { TRACE("Reloading surface because the d3d8/9 palette was changed\n"); /* TODO: This is not necessarily needed with hw palettized texture support */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, NULL); /* Make sure the texture is reloaded because of the palette change, this kills performance though :( */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INTEXTURE, FALSE); } } - IWineD3DSurface_LoadTexture(iface, srgb == SRGB_SRGB ? TRUE : FALSE); + IWineD3DSurface_LoadTexture((IWineD3DSurface *)surface, srgb == SRGB_SRGB ? TRUE : FALSE); - if (This->resource.pool == WINED3DPOOL_DEFAULT) { + if (surface->resource.pool == WINED3DPOOL_DEFAULT) + { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; tmp = 0.9f; ENTER_GL(); - glPrioritizeTextures(1, &This->texture_name, &tmp); + glPrioritizeTextures(1, &surface->texture_name, &tmp); LEAVE_GL(); } @@ -1118,8 +1121,9 @@ void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) } } -static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { - surface_internal_preload(iface, SRGB_ANY); +static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) +{ + surface_internal_preload((IWineD3DSurfaceImpl *)iface, SRGB_ANY); } /* Context activation is done by the caller. */ @@ -2707,7 +2711,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, c LEAVE_GL(); } else { /* bind the real texture, and make sure it up to date */ - surface_internal_preload(iface, SRGB_RGB); + surface_internal_preload(This, SRGB_RGB); surface_bind_and_dirtify(This, FALSE); } allocatedMemory = HeapAlloc(GetProcessHeap(), 0, width * height * 4); @@ -3009,7 +3013,7 @@ static void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *dst_surface, IWineD3D } context = context_acquire(device, src_surface, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, SRGB_RGB); ENTER_GL(); /* Bind the target texture */ @@ -3117,14 +3121,14 @@ static void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *dst_surface, IWine TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(device, src_surface, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->texture_name) { /* Get it a description */ - surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + surface_internal_preload(src_surface, SRGB_RGB); } ENTER_GL(); @@ -3657,7 +3661,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } /* Now load the surface */ - surface_internal_preload((IWineD3DSurface *) Src, SRGB_RGB); + surface_internal_preload(Src, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, This, CTXUSAGE_BLIT); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 556ceeb..ecdd836 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1872,7 +1872,7 @@ typedef struct IWineD3DBaseTextureClass void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass; -void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; void surface_prepare_texture(IWineD3DSurfaceImpl *surface,

1 0

Piotr Caban : msvcrt: Change strtod_l implementation.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: f76eef74018852253b03d305432b4864c724bed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76eef74018852253b03d3054… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:28 2010 +0200 msvcrt: Change strtod_l implementation. --- dlls/msvcrt/string.c | 104 ++++++++++++++++++++++++++++++++------------ dlls/msvcrt/tests/string.c | 34 +++++++++++++-- 2 files changed, 106 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 830fe51..6829e25 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -23,8 +23,11 @@ #define _ISOC99_SOURCE #include "config.h" +#include "wine/port.h" #include <stdlib.h> +#include <math.h> +#include <limits.h> #include <errno.h> #include "msvcrt.h" #include "wine/debug.h" @@ -141,13 +144,10 @@ double CDECL MSVCRT_atof( const char *str ) */ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) { - const char *p, *dec_point=NULL, *exp=NULL; - char *copy; + unsigned __int64 d=0, hlp; + int exp=0, sign=1; + const char *p; double ret; - int err = errno; - - if(!locale) - locale = get_locale(); if(!str) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -155,45 +155,93 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca return 0; } + if(!locale) + locale = get_locale(); + /* FIXME: use *_l functions */ p = str; while(isspace(*p)) p++; - if(*p=='+' || *p=='-') + + if(*p == '-') { + sign = -1; p++; - while(isdigit(*p)) + } else if(*p == '+') p++; - if(*p == *locale->locinfo->lconv->decimal_point) { - if(*p!='.') - dec_point = p; + + while(isdigit(*p)) { + hlp = d*10+*(p++)-'0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) { + exp++; + break; + } else + d = hlp; + } + while(isdigit(*p)) { + exp++; p++; } - while(isdigit(*p)) + + if(*p == *locale->locinfo->lconv->decimal_point) p++; - if(*p=='d' || *p=='D') - exp = p; - /* FIXME: don't copy input string */ - if((dec_point || exp) && (copy=_strdup(str))) { - if(dec_point) - copy[dec_point-str] = '.'; + while(isdigit(*p)) { + hlp = d*10+*(p++)-'0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) + break; - if(exp) - copy[exp-str] = 'e'; + d = hlp; + exp--; + } + while(isdigit(*p)) + p++; - ret = strtod(copy, end); + if(p == str) { if(end) - *end = (char*)str+(*end-copy); + *end = (char*)str; + return 0.0; + } - MSVCRT_free(copy); - } else - ret = strtod(str, end); + if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { + int e=0, s=1; - if(err != errno) - *MSVCRT__errno() = errno; + p++; + if(*p == '-') { + s = -1; + p++; + } else if(*p == '+') + p++; + + if(isdigit(*p)) { + while(isdigit(*p)) { + if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) + e = INT_MAX; + p++; + } + e *= s; - return ret; + if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; + } else { + if(*p=='-' || *p=='+') + p--; + p--; + } + } + + if(exp>0) + ret = (double)sign*d*pow(10, exp); + else + ret = (double)sign*d/pow(10, -exp); + if((d && ret==0.0) || isinf(ret)) + *MSVCRT__errno() = MSVCRT_ERANGE; + + if(end) + *end = (char*)p; + + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 433a318..5d61687 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1081,7 +1081,7 @@ static void test__strtoi64(void) } static inline BOOL almost_equal(double d1, double d2) { - if(d1-d2>-1e-16 && d1-d2<1e-16) + if(d1-d2>-1e-30 && d1-d2<1e-30) return TRUE; return FALSE; } @@ -1093,6 +1093,7 @@ static void test__strtod(void) const char double3[] = "INF"; const char double4[] = ".21e12"; const char double5[] = "214353e-3"; + const char overflow[] = "1d9999999999999999999"; char *end; double d; @@ -1106,8 +1107,8 @@ static void test__strtod(void) ok(end == double2+7, "incorrect end (%d)\n", end-double2); d = strtod(double3, &end); - todo_wine ok(almost_equal(d, 0), "d = %lf\n", d); - todo_wine ok(end == double3, "incorrect end (%d)\n", end-double3); + ok(almost_equal(d, 0), "d = %lf\n", d); + ok(end == double3, "incorrect end (%d)\n", end-double3); d = strtod(double4, &end); ok(almost_equal(d, 210000000000.0), "d = %lf\n", d); @@ -1127,12 +1128,37 @@ static void test__strtod(void) } d = strtod("12.1", NULL); - todo_wine ok(almost_equal(d, 12.0), "d = %lf\n", d); + ok(almost_equal(d, 12.0), "d = %lf\n", d); d = strtod("12,1", NULL); ok(almost_equal(d, 12.1), "d = %lf\n", d); setlocale(LC_ALL, "C"); + + /* Precision tests */ + d = strtod("0.1", NULL); + ok(almost_equal(d, 0.1), "d = %lf\n", d); + d = strtod("-0.1", NULL); + ok(almost_equal(d, -0.1), "d = %lf\n", d); + d = strtod("0.1281832188491894198128921", NULL); + ok(almost_equal(d, 0.1281832188491894198128921), "d = %lf\n", d); + d = strtod("0.82181281288121", NULL); + ok(almost_equal(d, 0.82181281288121), "d = %lf\n", d); + d = strtod("21921922352523587651128218821", NULL); + ok(almost_equal(d, 21921922352523587651128218821.0), "d = %lf\n", d); + d = strtod("0.1d238", NULL); + ok(almost_equal(d, 0.1e238L), "d = %lf\n", d); + d = strtod("0.1D-4736", NULL); + ok(almost_equal(d, 0.1e-4736L), "d = %lf\n", d); + + errno = 0xdeadbeef; + d = strtod(overflow, &end); + ok(errno == ERANGE, "errno = %x\n", errno); + ok(end == overflow+21, "incorrect end (%d)\n", end-overflow); + + errno = 0xdeadbeef; + strtod("-1d309", NULL); + ok(errno == ERANGE, "errno = %x\n", errno); } START_TEST(string)

1 0

Gerald Pfeifer : quartz: Fix return value for StdMediaSample2_GetTime in error cases.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 6c016ac039dd325c4335f454762899a8f3f829ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c016ac039dd325c4335f4547… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:00:54 2010 +0200 quartz: Fix return value for StdMediaSample2_GetTime in error cases. --- dlls/quartz/memallocator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 7f799c9..16b94e3 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -534,7 +534,7 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T hr = S_OK; } - return S_OK; + return hr; } static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_TIME * pStart, REFERENCE_TIME * pEnd)

1 0

Gerald Pfeifer : advapi32: Remove variable ret which is not really used from LsaLookupNames2.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 0351f56e67c6137a4103bd382dbd27e3450d3144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0351f56e67c6137a4103bd382… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 22:53:35 2010 +0200 advapi32: Remove variable ret which is not really used from LsaLookupNames2. --- dlls/advapi32/lsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index b5dab21..50877cc 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -355,7 +355,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { ULONG i, sid_size_total = 0, domain_size_max = 0, size; ULONG sid_size, domain_size, mapped; - BOOL ret, handled = FALSE; + BOOL handled = FALSE; SID_NAME_USE use; SID *sid; @@ -366,7 +366,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { handled = FALSE; sid_size = domain_size = 0; - ret = lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); + lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); if (handled) { sid_size_total += sid_size; @@ -408,7 +408,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, handled = FALSE; sid_size = sid_size_total; domain_size = domain_size_max; - ret = lookup_name( &names[i], sid, &sid_size, domain.Buffer, &domain_size, &use, &handled ); + lookup_name( &names[i], sid, &sid_size, domain.Buffer, &domain_size, &use, &handled ); if (handled) { (*sids)[i].Sid = sid;

1 0

Gerald Pfeifer : winmm: Remove variables duration and samples which are not really used from check_position .
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: d623f0045ab0e51456991394f7fee4c70d508234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d623f0045ab0e51456991394f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:04:20 2010 +0200 winmm: Remove variables duration and samples which are not really used from check_position. --- dlls/winmm/tests/capture.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index c46d35a..81d6281 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -54,14 +54,9 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, LPWAVEFORMATEX pwfx ) { MMTIME mmtime; - DWORD samples; - double duration; MMRESULT rc; DWORD returned; - samples=bytes/(pwfx->wBitsPerSample/8*pwfx->nChannels); - duration=((double)samples)/pwfx->nSamplesPerSec; - mmtime.wType = TIME_BYTES; rc=waveInGetPosition(win, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR,

1 0

Gerald Pfeifer : gdi32: Remove variable retb which is not really used from test_closefigure.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 6cad49da4bfe0da243b9478b8a84b443bf02db45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cad49da4bfe0da243b9478b8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:46:48 2010 +0200 gdi32: Remove variable retb which is not really used from test_closefigure. --- dlls/gdi32/tests/path.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 66cd039..43f3d62 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -393,7 +393,6 @@ done: } static void test_closefigure(void) { - BOOL retb; int nSize, nSizeWitness; HDC hdc = GetDC(0); @@ -402,7 +401,7 @@ static void test_closefigure(void) { LineTo(hdc, 95, 0); LineTo(hdc, 0, 95); - retb = CloseFigure(hdc); + CloseFigure(hdc); EndPath(hdc); nSize = GetPath(hdc, NULL, NULL, 0);

1 0

Alexandre Julliard : ntdll: Make TAPE_GetStatus inline to avoid a unused function warning.
by Alexandre Julliard April 26, 2010

April 26, 2010

Module: wine Branch: master Commit: 2e823590d4431dfcbea95d46c62193a2c6a21031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e823590d4431dfcbea95d46c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 07:18:46 2010 -0500 ntdll: Make TAPE_GetStatus inline to avoid a unused function warning. --- dlls/ntdll/tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index b8a4ab2..2667e18 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -88,7 +88,7 @@ static const char *io2str( DWORD io ) /****************************************************************** * TAPE_GetStatus */ -static NTSTATUS TAPE_GetStatus( int error ) +static inline NTSTATUS TAPE_GetStatus( int error ) { if (!error) return STATUS_SUCCESS; return FILE_GetNtStatus();

1 0