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

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

April 21, 2010

Module: wine Branch: master Commit: 79a014a5056b12a5f325b93cc618e41b0ef7f23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a014a5056b12a5f325b93cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:42 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_get_gl_buffer(). --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/surface.c | 25 ++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 716ec55..7aae16d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1874,11 +1874,11 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit) { const struct wined3d_gl_info *gl_info = context->gl_info; - IWineD3DSurface *rt = context->current_rt; + IWineD3DSurfaceImpl *rt = (IWineD3DSurfaceImpl *)context->current_rt; IWineD3DDeviceImpl *device; - device = ((IWineD3DSurfaceImpl *)rt)->resource.device; - if (!surface_is_offscreen((IWineD3DSurfaceImpl *)rt)) + device = rt->resource.device; + if (!surface_is_offscreen(rt)) { ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(rt)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 52d82b2..ff4a9b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4403,7 +4403,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurface *)target)); + context_set_draw_buffer(context, surface_get_gl_buffer(target)); LEAVE_GL(); } else @@ -5465,7 +5465,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context = context_acquire(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(surface)); + context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurfaceImpl *)surface)); } else { @@ -5773,7 +5773,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const if (!surface_is_offscreen((IWineD3DSurfaceImpl *)src_surface)) { - GLenum buffer = surface_get_gl_buffer(src_surface); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurfaceImpl *)src_surface); TRACE("Source surface %p is onscreen\n", src_surface); @@ -5809,7 +5809,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const /* Attach dst surface to dst fbo */ if (!surface_is_offscreen((IWineD3DSurfaceImpl *)dst_surface)) { - GLenum buffer = surface_get_gl_buffer(dst_surface); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurfaceImpl *)dst_surface); TRACE("Destination surface %p is onscreen\n", dst_surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91baf9c..46261fc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -925,20 +925,19 @@ void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned checkGLcall("set_compatible_renderbuffer"); } -GLenum surface_get_gl_buffer(IWineD3DSurface *iface) +GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->container; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)surface->container; - TRACE("iface %p.\n", iface); + TRACE("surface %p.\n", surface); - if (!(This->Flags & SFLAG_SWAPCHAIN)) + if (!(surface->Flags & SFLAG_SWAPCHAIN)) { - ERR("Surface %p is not on a swapchain.\n", iface); + ERR("Surface %p is not on a swapchain.\n", surface); return GL_NONE; } - if (swapchain->backBuffer && swapchain->backBuffer[0] == iface) + if (swapchain->backBuffer && (IWineD3DSurfaceImpl *)swapchain->backBuffer[0] == surface) { if (swapchain->render_to_fbo) { @@ -948,7 +947,7 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface) TRACE("Returning GL_BACK\n"); return GL_BACK; } - else if (swapchain->frontBuffer == iface) + else if ((IWineD3DSurfaceImpl *)swapchain->frontBuffer == surface) { TRACE("Returning GL_FRONT\n"); return GL_FRONT; @@ -1294,7 +1293,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, const RECT *rect, v else { /* Onscreen surfaces are always part of a swapchain */ - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); + GLenum buffer = surface_get_gl_buffer(This); TRACE("Locking %#x buffer\n", buffer); glReadBuffer(buffer); checkGLcall("glReadBuffer"); @@ -1516,7 +1515,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) */ if (!surface_is_offscreen(This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); + GLenum buffer = surface_get_gl_buffer(This); TRACE("Locking %#x buffer\n", buffer); ENTER_GL(); @@ -1775,7 +1774,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm if (!surface_is_offscreen(This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); + GLenum buffer = surface_get_gl_buffer(This); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); } @@ -2999,7 +2998,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } else { - glReadBuffer(surface_get_gl_buffer(SrcSurface)); + glReadBuffer(surface_get_gl_buffer(Src)); } checkGLcall("glReadBuffer"); @@ -3154,7 +3153,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } else { - glReadBuffer(surface_get_gl_buffer(SrcSurface)); + glReadBuffer(surface_get_gl_buffer(Src)); } /* TODO: Only back up the part that will be overwritten */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 260e3c7..0dfe082 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2679,7 +2679,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; +GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass implementation pointers to stretch_rect_fbo().
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 660ad06692033b2ef1f60fe86d8e029cbdfb0869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=660ad06692033b2ef1f60fe86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:43 2010 +0200 wined3d: Simply pass implementation pointers to stretch_rect_fbo(). --- dlls/wined3d/device.c | 46 +++++++++++++++++++-------------------- dlls/wined3d/surface.c | 12 +++++----- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 30 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=660ad06692033b2ef1f60…

1 0

Henri Verbeet : wined3d: Avoid some unnecessary invalidations of the the onscreen depth buffer.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 7b47dabd0951a3eeaca38d1997419a836b158b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b47dabd0951a3eeaca38d199… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:41 2010 +0200 wined3d: Avoid some unnecessary invalidations of the the onscreen depth buffer. This can happen for example when the application switches to a different depth/stencil for offscreen rendering and back again. --- dlls/wined3d/device.c | 41 ++++++++++++++++++++++++++++++++------- dlls/wined3d/drawprim.c | 4 +++ dlls/wined3d/swapchain.c | 5 ++++ dlls/wined3d/wined3d_private.h | 3 ++ 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00d94fa..52d82b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -563,6 +563,18 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c device->contexts = new_array; } +void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, + struct wined3d_context *context, IWineD3DSurfaceImpl *depth_stencil) +{ + if (device->onscreen_depth_stencil) + { + surface_load_ds_location(device->onscreen_depth_stencil, context, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location(device->onscreen_depth_stencil, SFLAG_DS_OFFSCREEN); + IWineD3DSurface_Release((IWineD3DSurface *)device->onscreen_depth_stencil); + } + device->onscreen_depth_stencil = depth_stencil; + IWineD3DSurface_AddRef((IWineD3DSurface *)device->onscreen_depth_stencil); +} /********************************************************** * IUnknown parts follows @@ -1853,6 +1865,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->shader_backend->shader_free_private(iface); /* Release the buffers (with sanity checks)*/ + if (This->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + This->onscreen_depth_stencil = NULL; + } + TRACE("Releasing the depth stencil buffer at %p\n", This->depth_stencil); if (This->depth_stencil && IWineD3DSurface_Release((IWineD3DSurface *)This->depth_stencil)) { @@ -4429,6 +4447,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_ZBUFFER) { DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + + if (location == SFLAG_DS_ONSCREEN && depth_stencil != This->onscreen_depth_stencil) + device_switch_onscreen_ds(This, context, depth_stencil); + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) surface_load_ds_location(depth_stencil, context, location); surface_modify_ds_location(depth_stencil, location); @@ -5915,14 +5937,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * || This->depth_stencil->Flags & SFLAG_DISCARD) { surface_modify_ds_location(This->depth_stencil, SFLAG_DS_DISCARDED); - } - else - { - struct wined3d_context *context = context_acquire(This, - (IWineD3DSurface *)This->render_targets[0], CTXUSAGE_RESOURCELOAD); - surface_load_ds_location(This->depth_stencil, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->depth_stencil, SFLAG_DS_OFFSCREEN); - context_release(context); + if (This->depth_stencil == This->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + This->onscreen_depth_stencil = NULL; + } } } @@ -6449,6 +6468,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } } + if (This->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + This->onscreen_depth_stencil = NULL; + } + /* Reset the depth stencil */ if (pPresentationParameters->EnableAutoDepthStencil) IWineD3DDevice_SetDepthStencilSurface(iface, (IWineD3DSurface *)This->auto_depth_stencil); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fd19930..4579a54 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -612,7 +612,11 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE] || This->stateBlock->renderState[WINED3DRS_ZENABLE]) + { + if (location == SFLAG_DS_ONSCREEN && This->depth_stencil != This->onscreen_depth_stencil) + device_switch_onscreen_ds(This, context, This->depth_stencil); surface_load_ds_location(This->depth_stencil, context, location); + } if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) surface_modify_ds_location(This->depth_stencil, location); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 389efc2..02e6bf7 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -465,6 +465,11 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO || This->device->depth_stencil->Flags & SFLAG_DISCARD) { surface_modify_ds_location(This->device->depth_stencil, SFLAG_DS_DISCARDED); + if (This->device->depth_stencil == This->device->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->device->onscreen_depth_stencil); + This->device->onscreen_depth_stencil = NULL; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97f5095..260e3c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1668,6 +1668,7 @@ struct IWineD3DDeviceImpl /* Render Target Support */ IWineD3DSurfaceImpl **render_targets; IWineD3DSurfaceImpl *auto_depth_stencil; + IWineD3DSurfaceImpl *onscreen_depth_stencil; IWineD3DSurfaceImpl *depth_stencil; /* palettes texture management */ @@ -1737,6 +1738,8 @@ void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) D void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; +void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context, + IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Fix some more misspellings of "device".
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: dc67164d0d965f7259ab27ea2fe0b60c8e01a14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc67164d0d965f7259ab27ea2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:39 2010 +0200 wined3d: Fix some more misspellings of "device". --- dlls/wined3d/directx.c | 4 +- dlls/wined3d/stateblock.c | 66 ++++++++++++++++++++-------------------- dlls/wined3d/swapchain_base.c | 11 +++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 41 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc67164d0d965f7259ab2…

1 0

Piotr Caban : msvcrt: Added strncpy_s implementation.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 23d0369d9d519f5b4fa5ba82bc01a542ceaf1a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d0369d9d519f5b4fa5ba82b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 20 21:39:11 2010 +0200 msvcrt: Added strncpy_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/heap.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0bbbfda..945bf4b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1388,7 +1388,7 @@ @ stub strncat_s @ cdecl strncmp(str str long) msvcrt.strncmp @ cdecl strncpy(ptr str long) msvcrt.strncpy -@ stub strncpy_s +@ cdecl strncpy_s(ptr long str long) msvcrt.strncpy_s @ cdecl strnlen(str long) msvcrt.strnlen @ cdecl strpbrk(str str) msvcrt.strpbrk @ cdecl strrchr(str long) msvcrt.strrchr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 45cd885..db16a0b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1372,7 +1372,7 @@ @ stub strncat_s @ cdecl strncmp(str str long) msvcrt.strncmp @ cdecl strncpy(ptr str long) msvcrt.strncpy -@ stub strncpy_s +@ cdecl strncpy_s(ptr long str long) msvcrt.strncpy_s @ cdecl strnlen(str long) msvcrt.strnlen @ cdecl strpbrk(str str) msvcrt.strpbrk @ cdecl strrchr(str long) msvcrt.strrchr diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7fd5d3b..c57a46c 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -550,3 +550,41 @@ int CDECL memmove_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, memmove(dest, src, count); return 0; } + +/********************************************************************* + * strncpy_s (MSVCRT.@) + */ +int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, + const char *src, MSVCRT_size_t count) +{ + MSVCRT_size_t i, end; + + TRACE("(%s %lu %s %lu)\n", dest, numberOfElements, src, count); + + if(!count) + return 0; + + if(!dest || !src || !numberOfElements) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(count!=_TRUNCATE && count<numberOfElements) + end = count; + else + end = numberOfElements-1; + + for(i=0; i<end && src[i]; i++) + dest[i] = src[i]; + + if(!src[i] || end==count || count==_TRUNCATE) { + dest[i] = '\0'; + return 0; + } + + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + dest[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 98db83f..f21588f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1328,7 +1328,7 @@ # stub strncat_s @ cdecl strncmp(str str long) ntdll.strncmp @ cdecl strncpy(ptr str long) ntdll.strncpy -# stub strncpy_s +@ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strrchr(str long) ntdll.strrchr

1 0

Paul Vriens : jscript: Update Dutch translation.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: a3f95b042f8e9dc86b580df261ba02694633ad58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f95b042f8e9dc86b580df26… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Apr 20 21:43:03 2010 +0200 jscript: Update Dutch translation. --- dlls/jscript/jscript_Nl.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index c4f761a..fec11a0 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -20,10 +20,13 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Fout bij het omzetten van het object naar een primitief type" IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" + IDS_CREATE_OBJ_ERROR "Automatiseringsserver kan het object niet creëren" IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" IDS_ARG_NOT_OPT "Argument is niet optioneel" IDS_SYNTAX_ERROR "Syntax fout" @@ -40,6 +43,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Boolean object verwacht" IDS_JSCRIPT_EXPECTED "JScript object verwacht" IDS_REGEXP_SYNTAX_ERROR "Syntax fout in reguliere expressie" + IDS_URI_INVALID_CHAR "De te coderen URI bevat ongeldige tekens" IDS_INVALID_LENGTH "Array lengte moet een eindig, positief geheel getal zijn" IDS_ARRAY_EXPECTED "Array object verwacht" }

1 0

Piotr Caban : msvcrt: Added _strtod_l implementation.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 94112ff96056178724d7a2743c55db8922a9c3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=94112ff96056178724d7a2743… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 21 11:26:22 2010 +0200 msvcrt: Added _strtod_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 62 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/tests/string.c | 56 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0023a15..cec8736 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -957,7 +957,7 @@ @ stub _strset_s @ cdecl _strtime(ptr) msvcrt._strtime @ stub _strtime_s -@ stub _strtod_l +@ cdecl _strtod_l(str ptr ptr) msvcrt._strtod_l @ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 @ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index add61f7..16ec74b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -943,7 +943,7 @@ @ stub _strset_s @ cdecl _strtime(ptr) msvcrt._strtime @ stub _strtime_s -@ stub _strtod_l +@ cdecl _strtod_l(str ptr ptr) msvcrt._strtod_l @ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 @ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5058340..d7b9c94 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -891,7 +891,7 @@ # stub _strset_s @ cdecl _strtime(ptr) # stub _strtime_s -# stub _strtod_l +@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l @ cdecl _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l # stub _strtol_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a241bab..830fe51 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -137,11 +137,71 @@ double CDECL MSVCRT_atof( const char *str ) } /********************************************************************* + * strtod_l (MSVCRT.@) + */ +double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) +{ + const char *p, *dec_point=NULL, *exp=NULL; + char *copy; + double ret; + int err = errno; + + if(!locale) + locale = get_locale(); + + if(!str) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return 0; + } + + /* FIXME: use *_l functions */ + p = str; + while(isspace(*p)) + p++; + if(*p=='+' || *p=='-') + p++; + while(isdigit(*p)) + p++; + if(*p == *locale->locinfo->lconv->decimal_point) { + if(*p!='.') + dec_point = p; + p++; + } + while(isdigit(*p)) + 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] = '.'; + + if(exp) + copy[exp-str] = 'e'; + + ret = strtod(copy, end); + if(end) + *end = (char*)str+(*end-copy); + + MSVCRT_free(copy); + } else + ret = strtod(str, end); + + if(err != errno) + *MSVCRT__errno() = errno; + + return ret; + +} + +/********************************************************************* * strtod (MSVCRT.@) */ double CDECL MSVCRT_strtod( const char *str, char **end ) { - return strtod( str, end ); + return MSVCRT_strtod_l( str, end, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c873d18..433a318 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1080,6 +1080,61 @@ static void test__strtoi64(void) ok(errno == ERANGE, "errno = %x\n", errno); } +static inline BOOL almost_equal(double d1, double d2) { + if(d1-d2>-1e-16 && d1-d2<1e-16) + return TRUE; + return FALSE; +} + +static void test__strtod(void) +{ + const char double1[] = "12.1"; + const char double2[] = "-13.721"; + const char double3[] = "INF"; + const char double4[] = ".21e12"; + const char double5[] = "214353e-3"; + + char *end; + double d; + + d = strtod(double1, &end); + ok(almost_equal(d, 12.1), "d = %lf\n", d); + ok(end == double1+4, "incorrect end (%d)\n", end-double1); + + d = strtod(double2, &end); + ok(almost_equal(d, -13.721), "d = %lf\n", d); + 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); + + d = strtod(double4, &end); + ok(almost_equal(d, 210000000000.0), "d = %lf\n", d); + ok(end == double4+6, "incorrect end (%d)\n", end-double4); + + d = strtod(double5, &end); + ok(almost_equal(d, 214.353), "d = %lf\n", d); + ok(end == double5+9, "incorrect end (%d)\n", end-double5); + + d = strtod("12.1d2", NULL); + ok(almost_equal(d, 12.1e2), "d = %lf\n", d); + + /* Set locale with non '.' decimal point (',') */ + if(!setlocale(LC_ALL, "Polish")) { + win_skip("system with limited locales\n"); + return; + } + + d = strtod("12.1", NULL); + todo_wine 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"); +} + START_TEST(string) { char mem[100]; @@ -1133,4 +1188,5 @@ START_TEST(string) test_strtol(); test_strnlen(); test__strtoi64(); + test__strtod(); }

1 0

Frédéric Delanoy : shell32: Update French translation.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: db4babfbbc8ed60cc5cabadc0bd39d574ce8d58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4babfbbc8ed60cc5cabadc0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Apr 20 22:08:48 2010 +0200 shell32: Update French translation. --- dlls/shell32/shell32_Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index e63a589..9d9e45d 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -4,6 +4,7 @@ * * Copyright 1998 Juergen Schmied * Copyright 2006-2009 Jonathan Ernst + * Copyright 2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -211,6 +212,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Groupe" IDS_SHV_COLUMN_DELFROM "Emplacement d'origine" IDS_SHV_COLUMN_DELDATE "Date de suppression" + IDS_SHV_COL_DOCS "Documents" + IDS_SHV_COL_STATUS "Statut" + IDS_SHV_COL_LOCATION "Emplacement" + IDS_SHV_COL_MODEL "Modèle" /* special folders */ IDS_DESKTOP "Bureau"

1 0

Piotr Caban : msvcrt: Added swprintf_s implementation.
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: c483bebe2b9dcbe7980dc09ec2217f33a15defb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c483bebe2b9dcbe7980dc09ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 20 21:39:01 2010 +0200 msvcrt: Added swprintf_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 17 +++++++++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 917ac4f..0bbbfda 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1400,7 +1400,7 @@ @ cdecl strtol(str ptr long) msvcrt.strtol @ cdecl strtoul(str ptr long) msvcrt.strtoul @ cdecl strxfrm(ptr str long) msvcrt.strxfrm -@ stub swprintf_s +@ varargs swprintf_s(ptr long wstr) msvcrt.swprintf_s @ varargs swscanf(wstr wstr) msvcrt.swscanf @ stub swscanf_s @ cdecl system(str) msvcrt.system diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5761301..45cd885 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1384,7 +1384,7 @@ @ cdecl strtol(str ptr long) msvcrt.strtol @ cdecl strtoul(str ptr long) msvcrt.strtoul @ cdecl strxfrm(ptr str long) msvcrt.strxfrm -@ stub swprintf_s +@ varargs swprintf_s(ptr long wstr) msvcrt.swprintf_s @ varargs swscanf(wstr wstr) msvcrt.swscanf @ stub swscanf_s @ cdecl system(str) msvcrt.system diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2700895..98db83f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1341,7 +1341,7 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(ptr wstr) MSVCRT_swprintf -# stub swprintf_s +@ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) MSVCRT_swscanf # stub swscanf_s @ cdecl system(str) MSVCRT_system diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index df0ac03..21d0d28 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1065,6 +1065,23 @@ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, .. } /********************************************************************* + * swprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *format, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start(ap, format); + r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), + INT_MAX, format, ap); + __ms_va_end(ap); + + return r; +} + +/********************************************************************* * vswprintf (MSVCRT.@) */ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, __ms_va_list args )

1 0

Henri Verbeet : wined3d: Move location loading and modification together in IWineD3DDeviceImpl_ClearSurface ().
by Alexandre Julliard April 21, 2010

April 21, 2010

Module: wine Branch: master Commit: 4f004a5565b332a501e84f724d66bcb391cd1c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f004a5565b332a501e84f724… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 00:35:05 2010 +0200 wined3d: Move location loading and modification together in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c840e2a..00d94fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4431,6 +4431,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) surface_load_ds_location(depth_stencil, context, location); + surface_modify_ds_location(depth_stencil, location); glDepthMask(GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); @@ -4441,6 +4442,8 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_TARGET) { + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); @@ -4507,16 +4510,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } } - if (Flags & WINED3DCLEAR_TARGET) - { - IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); - } - if (Flags & WINED3DCLEAR_ZBUFFER) { - /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */ - DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_modify_ds_location(depth_stencil, location); - } - LEAVE_GL(); if (wined3d_settings.strict_draw_ordering || ((target->Flags & SFLAG_SWAPCHAIN)

1 0