July 2009 - Wine-commits - list.winehq.org

Paul Vriens : winecfg: Fix Portuguese (Portugal) translation.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 5e6b3078627f1c7b6de7c2f42a92feec59a87dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6b3078627f1c7b6de7c2f42… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 12:41:15 2009 +0200 winecfg: Fix Portuguese (Portugal) translation. --- programs/winecfg/Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index e3b02a1..322d3cf 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -260,7 +260,7 @@ BEGIN PUSHBUTTON "Auto&detectar...",IDC_BUTTON_AUTODETECT,190,98,56,14 /* editing drive details */ - LTEXT "&Localização:",IDC_STATIC,15,123,20,9 + LTEXT "&Localização:",IDC_STATIC_PATH,15,123,20,9 EDITTEXT IDC_EDIT_PATH,41,120,160,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "&Procurar...",IDC_BUTTON_BROWSE_PATH,206,120,40,13

1 0

Henri Verbeet : wined3d: Remove the useless lastThread field from IWineD3DDeviceImpl.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: c114b04016bfde36933f3b2395f2b5c711b0bde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c114b04016bfde36933f3b239… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:12 2009 +0200 wined3d: Remove the useless lastThread field from IWineD3DDeviceImpl. --- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/device.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c625674..de428cd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1551,7 +1551,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: /* FBOs do not need a different context. Stay with whatever context is active at the moment */ - if(This->activeContext && tid == This->lastThread) { + if (This->activeContext && This->activeContext->tid == tid) + { context = This->activeContext; } else { /* This may happen if the app jumps straight into offscreen rendering @@ -1600,7 +1601,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf case ORM_BACKBUFFER: /* Stay with the currently active context for back buffer rendering */ - if(This->activeContext && tid == This->lastThread) { + if (This->activeContext && This->activeContext->tid == tid) + { context = This->activeContext; } else { /* This may happen if the app jumps straight into offscreen rendering @@ -1763,12 +1765,11 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if (!target) target = This->activeContext->current_rt; - if (This->activeContext->current_rt != target || tid != This->lastThread) + if (This->activeContext->current_rt != target || This->activeContext->tid != tid) { context = FindContext(This, target, tid); context->draw_buffer_dirty = TRUE; context->current_rt = target; - This->lastThread = tid; } else { /* Stick to the old context */ context = This->activeContext; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 422dbf8..94000df 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2165,7 +2165,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, } IWineD3DSurface_AddRef(This->render_targets[0]); This->activeContext = swapchain->context[0]; - This->lastThread = GetCurrentThreadId(); /* Depth Stencil support */ This->stencilBufferTarget = This->auto_depth_stencil_buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8d95e7..b7085c5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1584,7 +1584,6 @@ struct IWineD3DDeviceImpl /* Context management */ WineD3DContext **contexts; /* Dynamic array containing pointers to context structures */ WineD3DContext *activeContext; - DWORD lastThread; UINT numContexts; WineD3DContext *pbufferContext; /* The context that has a pbuffer as drawable */ DWORD pbufferWidth, pbufferHeight; /* Size of the buffer drawable */

1 0

Henri Verbeet : wined3d: Get rid of lastActiveRenderTarget.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 2d7500600bf2f109001597bd8d36724c1b551d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7500600bf2f109001597bd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:11 2009 +0200 wined3d: Get rid of lastActiveRenderTarget. --- dlls/wined3d/context.c | 15 ++++++--------- dlls/wined3d/device.c | 2 -- dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b92cc99..c625674 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -503,10 +503,8 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource /* Implicit render target destroyed, that means the * device is being destroyed whatever we set here, it * shouldn't matter. */ - TRACE("Device is being destroyed, setting lastActiveRenderTarget to 0xdeadbabe.\n"); - - This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; - This->activeContext->current_rt = This->lastActiveRenderTarget; + TRACE("Device is being destroyed, setting current_rt to 0xdeadbabe.\n"); + This->activeContext->current_rt = (IWineD3DSurface *)0xdeadbabe; } } else @@ -514,8 +512,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource WARN("Render target set, but swapchain does not exist!\n"); /* May happen during ddraw uninitialization. */ - This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; - This->activeContext->current_rt = This->lastActiveRenderTarget; + This->activeContext->current_rt = (IWineD3DSurface *)0xdeadcafe; } } else if (This->d3d_initialized) @@ -1764,13 +1761,13 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - if (!target) target = This->lastActiveRenderTarget; + if (!target) target = This->activeContext->current_rt; - if(This->lastActiveRenderTarget != target || tid != This->lastThread) { + if (This->activeContext->current_rt != target || tid != This->lastThread) + { context = FindContext(This, target, tid); context->draw_buffer_dirty = TRUE; context->current_rt = target; - This->lastActiveRenderTarget = target; This->lastThread = tid; } else { /* Stick to the old context */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00c0a78..422dbf8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2158,12 +2158,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if(swapchain->backBuffer && swapchain->backBuffer[0]) { TRACE("Setting rendertarget to %p\n", swapchain->backBuffer); This->render_targets[0] = swapchain->backBuffer[0]; - This->lastActiveRenderTarget = swapchain->backBuffer[0]; } else { TRACE("Setting rendertarget to %p\n", swapchain->frontBuffer); This->render_targets[0] = swapchain->frontBuffer; - This->lastActiveRenderTarget = swapchain->frontBuffer; } IWineD3DSurface_AddRef(This->render_targets[0]); This->activeContext = swapchain->context[0]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c76db79..d8d95e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1535,9 +1535,6 @@ struct IWineD3DDeviceImpl IWineD3DSurface *auto_depth_stencil_buffer; IWineD3DSurface *stencilBufferTarget; - /* Caches to avoid unneeded context changes */ - IWineD3DSurface *lastActiveRenderTarget; - /* palettes texture management */ UINT NumberOfPalettes; PALETTEENTRY **palettes;

1 0

Henri Verbeet : wined3d: Get rid of lastActiveRenderTarget in FindContext() .
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 223b9d5c015e430a123a6387872ac4158efc3f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223b9d5c015e430a123a63878… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:10 2009 +0200 wined3d: Get rid of lastActiveRenderTarget in FindContext(). --- dlls/wined3d/context.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 78ef374..b92cc99 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1667,7 +1667,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf * After that, the outer ActivateContext(which calls PreLoad) can activate the new * target for the new thread */ - if (readTexture && This->lastActiveRenderTarget != target) { + if (readTexture && context->current_rt != target) + { BOOL oldInDraw = This->isInDraw; /* PreLoad requires a context to load the texture, thus it will call ActivateContext. @@ -1679,15 +1680,15 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf /* Do that before switching the context: * Read the back buffer of the old drawable into the destination texture */ - if (((IWineD3DSurfaceImpl *)This->lastActiveRenderTarget)->texture_name_srgb) + if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb) { - surface_internal_preload(This->lastActiveRenderTarget, SRGB_BOTH); + surface_internal_preload(context->current_rt, SRGB_BOTH); } else { - surface_internal_preload(This->lastActiveRenderTarget, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); } /* Assume that the drawable will be modified by some other things now */ - IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, FALSE); + IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE); This->isInDraw = oldInDraw; }

1 0

Henri Verbeet : wined3d: Call ModifyLocation on "target" in IWineD3DDeviceImpl_ClearSurface().
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 8402519c7a39f9a0984cf21b1f159e9b8b01f411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8402519c7a39f9a0984cf21b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:09 2009 +0200 wined3d: Call ModifyLocation on "target" in IWineD3DDeviceImpl_ClearSurface(). This is the same pointer, but lastActiveRenderTarget will go away. --- 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 ddc4c70..00c0a78 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5065,7 +5065,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it */ - IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, TRUE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); } if (Flags & WINED3DCLEAR_ZBUFFER) { /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */

1 0

Henri Verbeet : wined3d: Keep track of a context's current render target.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: 6c0c1671b209cc91f7b1c3c4d6e246e1f34a7278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0c1671b209cc91f7b1c3c4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:08 2009 +0200 wined3d: Keep track of a context's current render target. --- dlls/wined3d/context.c | 36 ++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 48b8e09..78ef374 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -470,7 +470,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { case WINED3DRTYPE_SURFACE: { - if ((IWineD3DSurface *)resource == This->lastActiveRenderTarget) + if (This->activeContext && (IWineD3DSurface *)resource == This->activeContext->current_rt) { IWineD3DSwapChainImpl *swapchain; @@ -506,6 +506,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource TRACE("Device is being destroyed, setting lastActiveRenderTarget to 0xdeadbabe.\n"); This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; + This->activeContext->current_rt = This->lastActiveRenderTarget; } } else @@ -514,6 +515,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource /* May happen during ddraw uninitialization. */ This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; + This->activeContext->current_rt = This->lastActiveRenderTarget; } } else if (This->d3d_initialized) @@ -1019,6 +1021,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; + ret->current_rt = (IWineD3DSurface *)target; ret->isPBuffer = create_pbuffer; ret->tid = GetCurrentThreadId(); if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { @@ -1515,22 +1518,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; WineD3DContext *context = This->activeContext; BOOL oldRenderOffscreen = This->render_offscreen; - const struct GlPixelFormatDesc *old = ((IWineD3DSurfaceImpl *)This->lastActiveRenderTarget)->resource.format_desc; - const struct GlPixelFormatDesc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; const struct StateEntry *StateTable = This->StateTable; - - /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers - * the alpha blend state changes with different render target formats - */ - if (old->format != new->format) - { - /* Disable blending when the alpha mask has changed and when a format doesn't support blending */ - if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) - || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - { - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); - } - } + const struct GlPixelFormatDesc *old, *new; if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { TRACE("Rendering onscreen\n"); @@ -1638,6 +1627,20 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } } + /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers + * the alpha blend state changes with different render target formats. */ + old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; + new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; + if (old->format != new->format) + { + /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ + if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) + || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + } + } + /* When switching away from an offscreen render target, and we're not using FBOs, * we have to read the drawable into the texture. This is done via PreLoad(and * SFLAG_INDRAWABLE set on the surface). There are some things that need care though. @@ -1765,6 +1768,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(This->lastActiveRenderTarget != target || tid != This->lastThread) { context = FindContext(This, target, tid); context->draw_buffer_dirty = TRUE; + context->current_rt = target; This->lastActiveRenderTarget = target; This->lastThread = tid; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59b91b3..c76db79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1203,6 +1203,7 @@ struct WineD3DContext DWORD isStateDirty[STATE_HIGHEST/32 + 1]; /* Bitmap to find out quickly if a state is dirty */ IWineD3DSurface *surface; + IWineD3DSurface *current_rt; DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */

1 0

Henri Verbeet : wined3d: Pass NULL to ActivateContext() when we don' t need a specific target.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: ee4d18cc836ab0361ac1296f884e53b63b54e514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4d18cc836ab0361ac1296f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 11:51:07 2009 +0200 wined3d: Pass NULL to ActivateContext() when we don't need a specific target. Once we keep track of the wined3d context for each thread, lastActiveRenderTarget won't do what we want here. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/buffer.c | 10 +++++----- dlls/wined3d/context.c | 5 ++++- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 24 ++++++++++++------------ dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- 11 files changed, 43 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee4d18cc836ab0361ac12…

1 0

Alexandre Julliard : kernel32: Try to load a 32-bit builtin in WinExec16 if the file doesn't exist.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: a9c33bbc4aa254e72e5c2876387718e285b43e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c33bbc4aa254e72e5c28763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 12:22:01 2009 +0200 kernel32: Try to load a 32-bit builtin in WinExec16 if the file doesn't exist. --- dlls/kernel32/ne_module.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 4b45e7b..87a1a86 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -119,6 +119,15 @@ static inline void patch_code_segment( NE_MODULE *pModule ) /*********************************************************************** + * contains_path + */ +static inline int contains_path( LPCSTR name ) +{ + return ((*name && (name[1] == ':')) || strchr(name, '/') || strchr(name, '\\')); +} + + +/*********************************************************************** * NE_strcasecmp * * locale-independent case conversion for module lookups @@ -1674,6 +1683,8 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow ) int arglen; HINSTANCE16 ret; char buffer[MAX_PATH]; + LOADPARAMS16 params; + WORD showCmd[2]; if (*lpCmdLine == '"') /* has to be only one and only at beginning ! */ { @@ -1722,23 +1733,29 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow ) TRACE("name: '%s', cmdline: '%.*s'\n", name, cmdline[0], &cmdline[1]); - if (SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, NULL )) - { - LOADPARAMS16 params; - WORD showCmd[2]; - showCmd[0] = 2; - showCmd[1] = nCmdShow; + showCmd[0] = 2; + showCmd[1] = nCmdShow; - params.hEnvironment = 0; - params.cmdLine = MapLS( cmdline ); - params.showCmd = MapLS( showCmd ); - params.reserved = 0; + params.hEnvironment = 0; + params.cmdLine = MapLS( cmdline ); + params.showCmd = MapLS( showCmd ); + params.reserved = 0; + if (SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, NULL )) + { ret = LoadModule16( buffer, &params ); - UnMapLS( params.cmdLine ); - UnMapLS( params.showCmd ); } - else ret = GetLastError(); + else if (!contains_path( name )) /* try 16-bit builtin */ + { + lstrcpynA( buffer, name, sizeof(buffer) ); + if (strlen( buffer ) < sizeof(buffer) - 4 && !strchr( buffer, '.' )) strcat( buffer, ".exe" ); + ret = LoadModule16( buffer, &params ); + if (ret == ERROR_FILE_NOT_FOUND) ret = 21; /* it might be a 32-bit builtin too */ + } + else ret = ERROR_FILE_NOT_FOUND; + + UnMapLS( params.cmdLine ); + UnMapLS( params.showCmd ); HeapFree( GetProcessHeap(), 0, cmdline ); if (name != lpCmdLine) HeapFree( GetProcessHeap(), 0, name );

1 0

Piotr Caban : jscript: Add Error_number handling to constructor and error throwing functions.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: a77e369cfee850caed24b6e527b65b906a6caa60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77e369cfee850caed24b6e52… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:22 2009 +0200 jscript: Add Error_number handling to constructor and error throwing functions. --- dlls/jscript/error.c | 43 ++++++++++++++++++++++++++++++++++++++----- dlls/jscript/tests/api.js | 27 ++++++++++++++++++--------- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 076215f..d160dd6 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -15,6 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + +#include <math.h> #include "jscript.h" @@ -213,7 +217,7 @@ static HRESULT alloc_error(script_ctx_t *ctx, BOOL error_prototype, } static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, - const WCHAR *msg, DispatchEx **ret) + const UINT *number, const WCHAR *msg, DispatchEx **ret) { ErrorInstance *err; HRESULT hres; @@ -222,10 +226,17 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, if(FAILED(hres)) return hres; + if(number) { + V_VT(&err->number) = VT_I4; + V_I4(&err->number) = *number; + } + V_VT(&err->message) = VT_BSTR; if(msg) V_BSTR(&err->message) = SysAllocString(msg); else V_BSTR(&err->message) = SysAllocStringLen(NULL, 0); + VariantCopy(&err->description, &err->message); + if(!V_BSTR(&err->message)) { heap_free(err); return E_OUTOFMEMORY; @@ -238,11 +249,28 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, DispatchEx *constr) { DispatchEx *err; + VARIANT numv; + UINT num; BSTR msg = NULL; HRESULT hres; + V_VT(&numv) = VT_NULL; + if(arg_cnt(dp)) { - hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &msg); + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &numv); + if(FAILED(hres) || (V_VT(&numv)==VT_R8 && isnan(V_R8(&numv)))) + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &msg); + else if(V_VT(&numv) == VT_I4) + num = V_I4(&numv); + else + num = V_R8(&numv); + + if(FAILED(hres)) + return hres; + } + + if(arg_cnt(dp)>1 && !msg) { + hres = to_string(dispex->ctx, get_arg(dp, 1), ei, &msg); if(FAILED(hres)) return hres; } @@ -250,7 +278,11 @@ static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, switch(flags) { case INVOKE_FUNC: case DISPATCH_CONSTRUCT: - hres = create_error(dispex->ctx, constr, msg, &err); + if(V_VT(&numv) == VT_NULL) + hres = create_error(dispex->ctx, constr, NULL, msg, &err); + else + hres = create_error(dispex->ctx, constr, &num, msg, &err); + if(FAILED(hres)) return hres; @@ -394,7 +426,8 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH memcpy(pos, str, len*sizeof(WCHAR)); } - hres = create_error(ctx, constr, buf, &err); + id |= 0x800A0000; + hres = create_error(ctx, constr, &id, buf, &err); if(FAILED(hres)) return hres; @@ -404,7 +437,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH V_VT(&ei->var) = VT_DISPATCH; V_DISPATCH(&ei->var) = (IDispatch*)_IDispatchEx_(err); - return 0x800A0000+id; + return id; } HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4cf5bb6..c20cd8b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1287,22 +1287,31 @@ ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new Error("message"); ok(err.message === "message", "err.message !== 'message'"); ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); - -function exception_test(func, type) { +err = new Error(123); +ok(err.number === 123, "err.number = " + err.number); +err = new Error(0, "message"); +ok(err.number === 0, "err.number = " + err.number); +ok(err.message === "message", "err.message = " + err.message); +ok(err.description === "message", "err.description = " + err.description); + +function exception_test(func, type, number) { ret = ""; + num = ""; try { func(); } catch(e) { ret = e.name; + num = e.number; } ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); + ok(num === number, "Exception test, num = " + num + ", expected " + number + ". Executed function: " + func.toString()); } -exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); -exception_test(function() {Array(-3);}, "RangeError"); -exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); -exception_test(function() {date.setTime();}, "TypeError"); -exception_test(function() {arr.test();}, "TypeError"); -exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError"); -exception_test(function() {(new Number(3)).toString(1);}, "TypeError"); +exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError", -2146823282); +exception_test(function() {Array(-3);}, "RangeError", -2146823259); +exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError", -2146823278); +exception_test(function() {date.setTime();}, "TypeError", -2146827839); +exception_test(function() {arr.test();}, "TypeError", -2146827850); +exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError", -2146823287); +exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); reportSuccess();

1 0

Piotr Caban : jscript: Added Error_number and Error_description implementation.
by Alexandre Julliard 21 Jul '09

21 Jul '09

Module: wine Branch: master Commit: f3eef0d4c8e1f019894cc77e0cd51d55753a87d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eef0d4c8e1f019894cc77e0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:19 2009 +0200 jscript: Added Error_number and Error_description implementation. --- dlls/jscript/error.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index a9bcb55..076215f 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -42,15 +42,37 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ErrorInstance *This = (ErrorInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return VariantCopy(retv, &This->number); + case DISPATCH_PROPERTYPUT: + return VariantCopy(&This->number, get_arg(dp, 0)); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } static HRESULT Error_description(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ErrorInstance *This = (ErrorInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return VariantCopy(retv, &This->description); + case DISPATCH_PROPERTYPUT: + return VariantCopy(&This->description, get_arg(dp, 0)); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } /* ECMA-262 3rd Edition 15.11.4.3 */ @@ -123,6 +145,8 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; + VariantClear(&This->number); + VariantClear(&This->description); VariantClear(&This->message); heap_free(This); }

1 0