February 2010 - Wine-commits

Henri Verbeet : wined3d: Introduce surface_prepare_texture().
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 02e0b3ae1a3b3162026cdfacf077d4d3accb4ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e0b3ae1a3b3162026cdfacf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 18:17:57 2010 +0100 wined3d: Introduce surface_prepare_texture(). Similar to surface_prepare_system_memory(). In the long term we'll probably want to move the whole location management to resource.c and unify buffers and textures there. --- dlls/wined3d/surface.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 612979a..4505603 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1253,6 +1253,34 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) TRACE("Updated target %d\n", This->texture_target); } +/* Context activation is done by the caller. */ +static void surface_prepare_texture(IWineD3DSurfaceImpl *surface, BOOL srgb) +{ + DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; + GLenum format, internal, type; + GLsizei width, height; + CONVERT_TYPES convert; + int bpp; + + if (surface->Flags & alloc_flag) return; + + d3dfmt_get_conv(surface, TRUE, TRUE, &format, &internal, &type, &convert, &bpp, srgb); + if ((surface->Flags & SFLAG_NONPOW2) && !(surface->Flags & SFLAG_OVERSIZE)) + { + width = surface->pow2Width; + height = surface->pow2Height; + } + else + { + width = surface->glRect.right - surface->glRect.left; + height = surface->glRect.bottom - surface->glRect.top; + } + + surface_bind_and_dirtify(surface, srgb); + surface_allocate_surface(surface, internal, width, height, format, type); + surface->Flags |= alloc_flag; +} + static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *device = This->resource.device; @@ -4971,7 +4999,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D { /* Upload from system memory */ BOOL srgb = flag == SFLAG_INSRGBTEX; - DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; struct wined3d_context *context = NULL; d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, @@ -4998,6 +5025,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } if (!device->isInDraw) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); + + surface_prepare_texture(This, srgb); surface_bind_and_dirtify(This, srgb); if(This->CKeyFlags & WINEDDSD_CKSRCBLT) { @@ -5052,10 +5081,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D if ((This->Flags & SFLAG_NONPOW2) && !(This->Flags & SFLAG_OVERSIZE)) { TRACE("non power of two support\n"); - if(!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, internal, This->pow2Width, This->pow2Height, format, type); - This->Flags |= alloc_flag; - } if (mem || (This->Flags & SFLAG_PBO)) { surface_upload_data(This, internal, This->currentDesc.Width, This->currentDesc.Height, format, type, mem); } @@ -5063,10 +5088,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D /* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory * changed. So also keep track of memory changes. In this case the texture has to be reallocated */ - if(!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, internal, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, format, type); - This->Flags |= alloc_flag; - } if (mem || (This->Flags & SFLAG_PBO)) { surface_upload_data(This, internal, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, format, type, mem); }

1 0

Henri Verbeet : wined3d: Do not preload surfaces when attaching them to an FBO.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: af7dfcd378739127c50aa95ce40b13eb3d1950cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7dfcd378739127c50aa95ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 18:17:58 2010 +0100 wined3d: Do not preload surfaces when attaching them to an FBO. Just make sure the texture is allocated, so we have something to attach. Note also that context_apply_attachment_filter_states() runs under the GL lock, so preloading resources is actually unsafe there. --- dlls/wined3d/context.c | 20 +++++++++++--------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a1b4201..0878985 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -114,7 +114,7 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) } /* GL locking is done by the caller */ -static void context_apply_attachment_filter_states(IWineD3DSurface *surface, BOOL force_preload) +static void context_apply_attachment_filter_states(IWineD3DSurface *surface) { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; IWineD3DDeviceImpl *device = surface_impl->resource.device; @@ -148,7 +148,7 @@ static void context_apply_attachment_filter_states(IWineD3DSurface *surface, BOO IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); } - if (update_minfilter || update_magfilter || force_preload) + if (update_minfilter || update_magfilter) { GLenum target, bind_target; GLint old_binding; @@ -166,8 +166,6 @@ static void context_apply_attachment_filter_states(IWineD3DSurface *surface, BOO glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); } - surface_internal_preload(surface, SRGB_RGB); - glBindTexture(bind_target, surface_impl->texture_name); if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -208,7 +206,8 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, } else { - context_apply_attachment_filter_states(depth_stencil, TRUE); + surface_prepare_texture(depth_stencil_impl, FALSE); + context_apply_attachment_filter_states(depth_stencil); if (format_flags & WINED3DFMT_FLAG_DEPTH) { @@ -253,14 +252,15 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, void context_attach_surface_fbo(const struct wined3d_context *context, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { - const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Attach surface %p to %u\n", surface, idx); if (surface) { - context_apply_attachment_filter_states(surface, TRUE); + surface_prepare_texture(surface_impl, FALSE); + context_apply_attachment_filter_states(surface); gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, surface_impl->texture_target, surface_impl->texture_name, surface_impl->texture_level); @@ -431,10 +431,10 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ for (i = 0; i < gl_info->limits.buffers; ++i) { if (device->render_targets[i]) - context_apply_attachment_filter_states(device->render_targets[i], FALSE); + context_apply_attachment_filter_states(device->render_targets[i]); } if (device->stencilBufferTarget) - context_apply_attachment_filter_states(device->stencilBufferTarget, FALSE); + context_apply_attachment_filter_states(device->stencilBufferTarget); } for (i = 0; i < gl_info->limits.buffers; ++i) @@ -2156,6 +2156,8 @@ 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(context->current_rt, SRGB_RGB); + ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4505603..1a37fb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1254,7 +1254,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) } /* Context activation is done by the caller. */ -static void surface_prepare_texture(IWineD3DSurfaceImpl *surface, BOOL srgb) +void surface_prepare_texture(IWineD3DSurfaceImpl *surface, BOOL srgb) { DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; GLenum format, internal, type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9398a08..80a3b9c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1763,6 +1763,7 @@ typedef struct IWineD3DBaseTextureClass void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(IWineD3DSurface *iface) DECLSPEC_HIDDEN; +void surface_prepare_texture(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; typedef struct IWineD3DBaseTextureImpl {

1 0

Henri Verbeet : wined3d: Remove the unused device type parameter from the fragment pipe's get_caps( ) function.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 497386dc5cfd8442c7d5f26ff6ea8e283d19eb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497386dc5cfd8442c7d5f26ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 18:17:59 2010 +0100 wined3d: Remove the unused device type parameter from the fragment pipe's get_caps() function. On the subject of actually supporting software devices, we should probably implement those by creating a software or reference adapter with appropriate gl_info and pipe implementations and creating a device based on that. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e4653f0..fbb1b77 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5278,7 +5278,7 @@ static void arbfp_free(IWineD3DDevice *iface) { } } -static void arbfp_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index becd447..0f911e9 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1061,7 +1061,7 @@ static void atifs_enable(IWineD3DDevice *iface, BOOL enable) { LEAVE_GL(); } -static void atifs_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79be3a8..da806b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7052,7 +7052,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, memset(&ffp_caps, 0, sizeof(ffp_caps)); fragment_pipeline = adapter->fragment_pipe; device->frag_pipe = fragment_pipeline; - fragment_pipeline->get_caps(device_type, &adapter->gl_info, &ffp_caps); + fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; device->max_ffp_texture_stages = ffp_caps.MaxTextureBlendStages; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e259375..c870f88 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4222,7 +4222,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, adapter->shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); memset(&fragment_caps, 0, sizeof(fragment_caps)); - adapter->fragment_pipe->get_caps(DeviceType, &adapter->gl_info, &fragment_caps); + adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ pCaps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 82a71da..56e2ee7 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -627,8 +627,7 @@ static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { LEAVE_GL(); } -static void nvrc_fragment_get_caps(WINED3DDEVTYPE devtype, - const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) +static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) { pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | WINED3DTEXOPCAPS_ADDSIGNED | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80a3b9c..3d78281 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1136,7 +1136,7 @@ struct fragment_caps struct fragment_pipeline { void (*enable_extension)(IWineD3DDevice *iface, BOOL enable); - void (*get_caps)(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); + void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); HRESULT (*alloc_private)(IWineD3DDevice *iface); void (*free_private)(IWineD3DDevice *iface); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup);

1 0

Henri Verbeet : wined3d: Remove the unused device type parameter from the shader backend's get_caps () function.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 576ea95803ea976aadf49516079a519d47a89c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576ea95803ea976aadf495160… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 18:18:00 2010 +0100 wined3d: Remove the unused device type parameter from the shader backend's get_caps() function. --- dlls/wined3d/arb_program_shader.c | 5 ++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 3 +-- dlls/wined3d/shader.c | 3 +-- dlls/wined3d/state.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fbb1b77..519f9c8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4609,8 +4609,7 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { return TRUE; } -static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, - struct shader_caps *pCaps) +static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { DWORD vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); DWORD ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); @@ -4618,7 +4617,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ /* We don't have an ARB fixed function pipeline yet, so let the none backend set its caps, * then overwrite the shader specific ones */ - none_shader_backend.shader_get_caps(devtype, gl_info, pCaps); + none_shader_backend.shader_get_caps(gl_info, pCaps); if (gl_info->supported[ARB_VERTEX_PROGRAM]) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index da806b0..a25f5e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7044,7 +7044,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->shader_backend = adapter->shader_backend; memset(&shader_caps, 0, sizeof(shader_caps)); - device->shader_backend->shader_get_caps(device_type, &adapter->gl_info, &shader_caps); + device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; device->vs_clipping = shader_caps.VSClipping; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c870f88..8ba33ba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4219,7 +4219,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->VertexTextureFilterCaps = 0; memset(&shader_caps, 0, sizeof(shader_caps)); - adapter->shader_backend->shader_get_caps(DeviceType, &adapter->gl_info, &shader_caps); + adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); memset(&fragment_caps, 0, sizeof(fragment_caps)); adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4892bfe..ca05ebf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4843,8 +4843,7 @@ static BOOL shader_glsl_dirty_const(IWineD3DDevice *iface) { return FALSE; } -static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, - const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) +static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { /* Nvidia Geforce6/7 or Ati R4xx/R5xx cards with GLSL support, support VS 3.0 but older Nvidia/Ati * models with GLSL support only support 2.0. In case of nvidia we can detect VS 2.0 support based diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 23de4a7..e95b4b5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1387,8 +1387,7 @@ static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -static void shader_none_get_caps(WINED3DDEVTYPE devtype, - const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { /* Set the shader caps to 0 for the none shader backend */ caps->VertexShaderVersion = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c8595c..6f27baf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5517,8 +5517,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { /* Context activation is done by the caller. */ static void ffp_enable(IWineD3DDevice *iface, BOOL enable) { } -static void ffp_fragment_get_caps(WINED3DDEVTYPE devtype, - const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) +static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *pCaps) { pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | WINED3DTEXOPCAPS_ADDSIGNED | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d78281..1f568eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -720,7 +720,7 @@ typedef struct { HRESULT (*shader_alloc_private)(IWineD3DDevice *iface); void (*shader_free_private)(IWineD3DDevice *iface); BOOL (*shader_dirtifyable_constants)(IWineD3DDevice *iface); - void (*shader_get_caps)(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *caps); + void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); void (*shader_add_instruction_modifiers)(const struct wined3d_shader_instruction *ins); } shader_backend_t;

1 0

André Hentschel : oleaut32: Fix day rolling.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: ac1ca87b21052a784176f92cd71defedda6e1ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1ca87b21052a784176f92cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 3 19:21:15 2010 +0100 oleaut32: Fix day rolling. --- dlls/oleaut32/tests/vartest.c | 7 +++- dlls/oleaut32/variant.c | 64 +++++++++++------------------------------ 2 files changed, 22 insertions(+), 49 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 377a847..34f0e3f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1652,17 +1652,20 @@ static void test_VarDateFromUdate(void) UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds */ UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ + UD2T(1,300,1980,18,1,16,0,2,1,0,S_OK,38322.75087962963); /* Test fwdrolled month */ + UD2T(300,1,1980,18,1,16,0,2,1,0,S_OK,29520.75087962963); /* Test fwdrolled days */ UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled hours */ UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled minutes */ UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled seconds */ + UD2T(1,-300,1980,18,1,16,0,2,1,0,S_OK,20059.75087962963); /* Test backrolled month */ + UD2T(-300,1,1980,18,1,16,0,2,1,0,S_OK,28920.75087962963); /* Test backrolled days */ UD2T(3,1,1980,-30,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ UD2T(1,1,1980,20,-119,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ UD2T(1,1,1980,18,3,-104,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ UD2T(1,12001,-1020,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test rolled year and month */ UD2T(1,-23,1982,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled month */ - todo_wine UD2T(-59,3,1980,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled days */ + UD2T(-59,3,1980,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled days */ todo_wine UD2T(1,1,0,0,0,0,0,0,0,0,S_OK,36526); /* Test zero year */ - UD2T(0,0,1980,0,0,0,0,0,0,0,S_OK,29189); /* Test zero day and month */ UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Test zero day = LastDayOfMonth */ UD2T(-1,1,1980,18,1,16,0,0,0,0,S_OK,29219.75087962963); /* Test day -1 = LastDayOfMonth - 1 */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index dabe746..a2a5bd8 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1154,64 +1154,34 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) iMinute = iMinute % 60; iDay += (iHour - (iHour % 24)) / 24; iHour = iHour % 24; - /* FIXME: Roll Days */ iYear += (iMonth - (iMonth % 12)) / 12; iMonth = iMonth % 12; - - if (iSecond<0){iSecond+=60; iMinute--;} - if (iMinute<0){iMinute+=60; iHour--;} - if (iHour<0) {iHour+=24; iDay--;} - if (iDay<0) - { - iDay+=days[iMonth]; - iMonth--; - if (iMonth == 2 && IsLeapYear(iYear)) - iDay++; - } if (iMonth<=0) {iMonth+=12; iYear--;} - if (iYear<0) iYear+=2000; - - if (!lpUd->st.wDay) + while (iDay > days[iMonth]) { - /* Roll back the date one day */ - if (lpUd->st.wMonth == 1) - { - /* Roll back to December 31 of the previous year */ - lpUd->st.wDay = 31; - lpUd->st.wMonth = 12; - lpUd->st.wYear--; - } + if (iMonth == 2 && IsLeapYear(iYear)) + iDay -= 29; else - { - lpUd->st.wMonth--; /* Previous month */ - if (lpUd->st.wMonth == 2 && IsLeapYear(lpUd->st.wYear)) - lpUd->st.wDay = 29; /* February has 29 days on leap years */ - else - lpUd->st.wDay = days[lpUd->st.wMonth]; /* Last day of the month */ - } + iDay -= days[iMonth]; + iMonth++; + iYear += (iMonth - (iMonth % 12)) / 12; + iMonth = iMonth % 12; } - else if (lpUd->st.wDay > 28) + while (iDay <= 0) { - int rollForward = 0; - - /* Possibly need to roll the date forward */ + iMonth--; + if (iMonth<=0) {iMonth+=12; iYear--;} if (iMonth == 2 && IsLeapYear(iYear)) - rollForward = iDay - 29; /* February has 29 days on leap years */ + iDay += 29; else - rollForward = iDay - days[iMonth]; - - if (rollForward > 0) - { - iDay = rollForward; - iMonth++; - if (iMonth > 12) - { - iMonth = 1; /* Roll forward into January of the next year */ - iYear++; - } - } + iDay += days[iMonth]; } + if (iSecond<0){iSecond+=60; iMinute--;} + if (iMinute<0){iMinute+=60; iHour--;} + if (iHour<0) {iHour+=24; iDay--;} + if (iYear<0) iYear+=2000; + lpUd->st.wYear = iYear; lpUd->st.wMonth = iMonth; lpUd->st.wDay = iDay;

1 0

André Hentschel : oleaut32: Fix year 0.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 23ff47610e5044f8eebdc21a55728e14bca62537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ff47610e5044f8eebdc21a5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 3 19:24:06 2010 +0100 oleaut32: Fix year 0. --- dlls/oleaut32/tests/vartest.c | 2 +- dlls/oleaut32/variant.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 34f0e3f..c5d65a2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1665,7 +1665,7 @@ static void test_VarDateFromUdate(void) UD2T(1,12001,-1020,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test rolled year and month */ UD2T(1,-23,1982,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled month */ UD2T(-59,3,1980,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled days */ - todo_wine UD2T(1,1,0,0,0,0,0,0,0,0,S_OK,36526); /* Test zero year */ + UD2T(1,1,0,0,0,0,0,0,0,0,S_OK,36526); /* Test zero year */ UD2T(0,0,1980,0,0,0,0,0,0,0,S_OK,29189); /* Test zero day and month */ UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Test zero day = LastDayOfMonth */ UD2T(-1,1,1980,18,1,16,0,0,0,0,S_OK,29219.75087962963); /* Test day -1 = LastDayOfMonth - 1 */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a2a5bd8..55d0935 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1145,7 +1145,7 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iYear > 9999 || iYear < -9999) return E_INVALIDARG; /* Invalid value */ /* Years < 100 are treated as 1900 + year */ - if (iYear >= 0 && iYear < 100) + if (iYear > 0 && iYear < 100) iYear += 1900; iMinute += (iSecond - (iSecond % 60)) / 60; @@ -1180,7 +1180,7 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) if (iSecond<0){iSecond+=60; iMinute--;} if (iMinute<0){iMinute+=60; iHour--;} if (iHour<0) {iHour+=24; iDay--;} - if (iYear<0) iYear+=2000; + if (iYear<=0) iYear+=2000; lpUd->st.wYear = iYear; lpUd->st.wMonth = iMonth;

1 0

Peter Rosin : kernel32: Add tests for SetThreadErrorMode and GetThreadErrorMode.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: e8a32ec2b81b7a9eec88cbe8ab8aac6bf42f1a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a32ec2b81b7a9eec88cbe8a… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Wed Feb 3 14:33:38 2010 +0100 kernel32: Add tests for SetThreadErrorMode and GetThreadErrorMode. --- dlls/kernel32/tests/thread.c | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e98b6e2..85987d9 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -62,6 +62,9 @@ static BOOL (WINAPI *pSetThreadPriorityBoost)(HANDLE,BOOL); static BOOL (WINAPI *pRegisterWaitForSingleObject)(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); static BOOL (WINAPI *pUnregisterWait)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pSetThreadErrorMode)(DWORD,PDWORD); +static DWORD (WINAPI *pGetThreadErrorMode)(void); +static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static HANDLE create_target_process(const char *arg) { @@ -1209,9 +1212,103 @@ static void test_TLS(void) cleanup_thread_sync_helpers(); } +static void test_ThreadErrorMode(void) +{ + DWORD oldmode; + DWORD mode; + DWORD rtlmode; + BOOL ret; + + if (!pSetThreadErrorMode || !pGetThreadErrorMode) + { + skip("SetThreadErrorMode and/or GetThreadErrorMode unavailable (added in Windows 7)\n"); + return; + } + + if (!pRtlGetThreadErrorMode) { + win_skip("RtlGetThreadErrorMode not available\n"); + return; + } + + oldmode = pGetThreadErrorMode(); + + ret = pSetThreadErrorMode(0, &mode); + ok(ret, "SetThreadErrorMode failed\n"); + ok(mode == oldmode, + "SetThreadErrorMode returned old mode 0x%x, expected 0x%x\n", + mode, oldmode); + mode = pGetThreadErrorMode(); + ok(mode == 0, "GetThreadErrorMode returned mode 0x%x, expected 0\n", mode); + rtlmode = pRtlGetThreadErrorMode(); + ok(rtlmode == 0, + "RtlGetThreadErrorMode returned mode 0x%x, expected 0\n", mode); + + ret = pSetThreadErrorMode(SEM_FAILCRITICALERRORS, &mode); + ok(ret, "SetThreadErrorMode failed\n"); + ok(mode == 0, + "SetThreadErrorMode returned old mode 0x%x, expected 0\n", mode); + mode = pGetThreadErrorMode(); + ok(mode == SEM_FAILCRITICALERRORS, + "GetThreadErrorMode returned mode 0x%x, expected SEM_FAILCRITICALERRORS\n", + mode); + rtlmode = pRtlGetThreadErrorMode(); + ok(rtlmode == 0x10, + "RtlGetThreadErrorMode returned mode 0x%x, expected 0x10\n", mode); + + ret = pSetThreadErrorMode(SEM_NOGPFAULTERRORBOX, &mode); + ok(ret, "SetThreadErrorMode failed\n"); + ok(mode == SEM_FAILCRITICALERRORS, + "SetThreadErrorMode returned old mode 0x%x, expected SEM_FAILCRITICALERRORS\n", + mode); + mode = pGetThreadErrorMode(); + ok(mode == SEM_NOGPFAULTERRORBOX, + "GetThreadErrorMode returned mode 0x%x, expected SEM_NOGPFAULTERRORBOX\n", + mode); + rtlmode = pRtlGetThreadErrorMode(); + ok(rtlmode == 0x20, + "RtlGetThreadErrorMode returned mode 0x%x, expected 0x20\n", mode); + + ret = pSetThreadErrorMode(SEM_NOOPENFILEERRORBOX, NULL); + ok(ret, "SetThreadErrorMode failed\n"); + mode = pGetThreadErrorMode(); + ok(mode == SEM_NOOPENFILEERRORBOX, + "GetThreadErrorMode returned mode 0x%x, expected SEM_NOOPENFILEERRORBOX\n", + mode); + rtlmode = pRtlGetThreadErrorMode(); + ok(rtlmode == 0x40, + "RtlGetThreadErrorMode returned mode 0x%x, expected 0x40\n", rtlmode); + + for (mode = 1; mode; mode <<= 1) + { + ret = pSetThreadErrorMode(mode, NULL); + if (mode & (SEM_FAILCRITICALERRORS | + SEM_NOGPFAULTERRORBOX | + SEM_NOOPENFILEERRORBOX)) + { + ok(ret, + "SetThreadErrorMode(0x%x,NULL) failed with error %d\n", + mode, GetLastError()); + } + else + { + DWORD GLE = GetLastError(); + ok(!ret, + "SetThreadErrorMode(0x%x,NULL) succeeded, expected failure\n", + mode); + ok(GLE == ERROR_INVALID_PARAMETER, + "SetThreadErrorMode(0x%x,NULL) failed with %d, " + "expected ERROR_INVALID_PARAMETER\n", + mode, GLE); + } + } + + pSetThreadErrorMode(oldmode, NULL); +} + START_TEST(thread) { HINSTANCE lib; + HINSTANCE ntdll; int argc; char **argv; argc = winetest_get_mainargs( &argv ); @@ -1228,6 +1325,14 @@ START_TEST(thread) pRegisterWaitForSingleObject=(void *)GetProcAddress(lib,"RegisterWaitForSingleObject"); pUnregisterWait=(void *)GetProcAddress(lib,"UnregisterWait"); pIsWow64Process=(void *)GetProcAddress(lib,"IsWow64Process"); + pSetThreadErrorMode=(void *)GetProcAddress(lib,"SetThreadErrorMode"); + pGetThreadErrorMode=(void *)GetProcAddress(lib,"GetThreadErrorMode"); + + ntdll=GetModuleHandleA("ntdll.dll"); + if (ntdll) + { + pRtlGetThreadErrorMode=(void *)GetProcAddress(ntdll,"RtlGetThreadErrorMode"); + } if (argc >= 3) { @@ -1271,4 +1376,5 @@ START_TEST(thread) test_QueueUserWorkItem(); test_RegisterWaitForSingleObject(); test_TLS(); + test_ThreadErrorMode(); }

1 0

Peter Rosin : kernel32: Add SetThreadErrorMode and GetThreadErrorMode.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 805f7d79db7811d1ef1e5396d5d0702a539b7e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805f7d79db7811d1ef1e5396d… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Wed Feb 3 14:37:35 2010 +0100 kernel32: Add SetThreadErrorMode and GetThreadErrorMode. --- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/tests/thread.c | 2 +- dlls/kernel32/thread.c | 61 ++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 + 4 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index db9713f..7c32ff7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -643,6 +643,7 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) +@ stdcall GetThreadErrorMode() @ stdcall GetThreadId(ptr) # @ stub GetThreadIOPendingFlag @ stdcall GetThreadLocale() @@ -1056,6 +1057,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall SetThreadContext(long ptr) +@ stdcall SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 85987d9..69203fe 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1221,7 +1221,7 @@ static void test_ThreadErrorMode(void) if (!pSetThreadErrorMode || !pGetThreadErrorMode) { - skip("SetThreadErrorMode and/or GetThreadErrorMode unavailable (added in Windows 7)\n"); + win_skip("SetThreadErrorMode and/or GetThreadErrorMode unavailable (added in Windows 7)\n"); return; } diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 6979c36..e3754c2 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -651,3 +651,64 @@ DWORD WINAPI GetCurrentThreadId(void) } #endif /* __i386__ */ + +/************************************************************************* + * rtlmode_to_win32mode + */ +static DWORD rtlmode_to_win32mode( DWORD rtlmode ) +{ + DWORD win32mode = 0; + + if (rtlmode & 0x10) + win32mode |= SEM_FAILCRITICALERRORS; + if (rtlmode & 0x20) + win32mode |= SEM_NOGPFAULTERRORBOX; + if (rtlmode & 0x40) + win32mode |= SEM_NOOPENFILEERRORBOX; + + return win32mode; +} + +/*********************************************************************** + * SetThreadErrorMode (KERNEL32.@) + */ +BOOL WINAPI SetThreadErrorMode( DWORD mode, LPDWORD oldmode ) +{ + NTSTATUS status; + DWORD tmp = 0; + + if (mode & ~(SEM_FAILCRITICALERRORS | + SEM_NOGPFAULTERRORBOX | + SEM_NOOPENFILEERRORBOX)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (mode & SEM_FAILCRITICALERRORS) + tmp |= 0x10; + if (mode & SEM_NOGPFAULTERRORBOX) + tmp |= 0x20; + if (mode & SEM_NOOPENFILEERRORBOX) + tmp |= 0x40; + + status = RtlSetThreadErrorMode( tmp, oldmode ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + if (oldmode) + *oldmode = rtlmode_to_win32mode(*oldmode); + + return TRUE; +} + +/*********************************************************************** + * GetThreadErrorMode (KERNEL32.@) + */ +DWORD WINAPI GetThreadErrorMode( void ) +{ + return rtlmode_to_win32mode( RtlGetThreadErrorMode() ); +} diff --git a/include/winbase.h b/include/winbase.h index 1cd26f5..06bc622 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1762,6 +1762,7 @@ WINBASEAPI DWORD WINAPI GetTickCount(void); WINBASEAPI ULONGLONG WINAPI GetTickCount64(void); WINBASEAPI DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); WINBASEAPI BOOL WINAPI GetThreadContext(HANDLE,CONTEXT *); +WINBASEAPI DWORD WINAPI GetThreadErrorMode(void); WINBASEAPI INT WINAPI GetThreadPriority(HANDLE); WINBASEAPI BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); @@ -2096,6 +2097,7 @@ WINBASEAPI DWORD WINAPI SetTapeParameters(HANDLE,DWORD,LPVOID); WINBASEAPI DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL); WINBASEAPI DWORD_PTR WINAPI SetThreadAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT *); +WINBASEAPI BOOL WINAPI SetThreadErrorMode(DWORD,LPDWORD); WINBASEAPI DWORD WINAPI SetThreadExecutionState(EXECUTION_STATE); WINBASEAPI DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); WINBASEAPI BOOL WINAPI SetThreadPriority(HANDLE,INT);

1 0

Michael Stefaniuc : user32: Avoid using HIWORD() on atoms/resources.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 0a22cd2b8f85fc7c89e91302e6f4bd38b5c7d27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a22cd2b8f85fc7c89e91302e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 3 21:04:27 2010 +0100 user32: Avoid using HIWORD() on atoms/resources. --- dlls/user32/class.c | 10 +++++----- dlls/user32/cursoricon.c | 2 +- dlls/user32/defwnd.c | 4 ++-- dlls/user32/dialog.c | 8 ++++---- dlls/user32/hook.c | 8 ++++---- dlls/user32/message.c | 16 ++++++++-------- dlls/user32/msgbox.c | 30 +++++++++++++++--------------- dlls/user32/property.c | 12 ++++++------ dlls/user32/resource.c | 2 +- 9 files changed, 46 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a22cd2b8f85fc7c89e91…

1 0

Eric Pouech : winedbg: Extend print_typed_basic to handle unicode strings.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: f91948ad94b1a7c8d3dd31cc5b3829cbacf2cb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91948ad94b1a7c8d3dd31cc5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:07 2010 +0100 winedbg: Extend print_typed_basic to handle unicode strings. --- programs/winedbg/memory.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index e4f4729..c8ceeb1 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -347,6 +347,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) DWORD tag, size, count, bt; struct dbg_type type = lvalue->type; struct dbg_type sub_type; + struct dbg_lvalue sub_lvalue; if (!types_get_real_type(&type, &tag)) return; @@ -383,6 +384,11 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) print_char: if (size == 1 && (val_int < 0x20 || val_int > 0x80)) dbg_printf("%d", (int)val_int); + else if (size == 2) + { + WCHAR wch = (WCHAR)val_int; + dbg_outputW(&wch, 1); + } else dbg_printf("'%c'", (char)val_int); break; @@ -396,32 +402,31 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } break; case SymTagPointerType: - if (!memory_read_value(lvalue, sizeof(void*), &val_ptr)) return; - - sub_type.module = lvalue->type.module; - if (!types_get_info(&type, TI_GET_TYPE, &sub_type.id) || - sub_type.id == dbg_itype_none) + if (!types_deref(lvalue, &sub_lvalue)) { - dbg_printf("Internal symbol error: unable to access memory location %p", val_ptr); + dbg_printf("Internal symbol error: unable to access memory location %p", + memory_to_linear_addr(&lvalue->addr)); break; } - if (!types_get_real_type(&sub_type, &tag)) return; - - if (types_get_info(&sub_type, TI_GET_SYMTAG, &tag) && tag == SymTagBaseType && - types_get_info(&sub_type, TI_GET_BASETYPE, &bt) && (bt == btChar || bt == btInt) && - types_get_info(&sub_type, TI_GET_LENGTH, &size64) && size64 == 1) + val_ptr = memory_to_linear_addr(&sub_lvalue.addr); + if (types_get_real_type(&sub_lvalue.type, &tag) && tag == SymTagBaseType && + types_get_info(&sub_lvalue.type, TI_GET_BASETYPE, &bt) && + types_get_info(&sub_lvalue.type, TI_GET_LENGTH, &size64)) { char buffer[1024]; if (!val_ptr) dbg_printf("0x0"); - else if (memory_get_string(dbg_curr_process, val_ptr, - lvalue->cookie == DLV_TARGET, - size64 == 2, buffer, sizeof(buffer))) - dbg_printf("\"%s\"", buffer); - else - dbg_printf("*** invalid address %p ***", val_ptr); + else if (((bt == btChar || bt == btInt) && size64 == 1) || (bt == btUInt && size64 == 2)) + { + if (memory_get_string(dbg_curr_process, val_ptr, sub_lvalue.cookie == DLV_TARGET, + size64 == 2, buffer, sizeof(buffer))) + dbg_printf("\"%s\"", buffer); + else + dbg_printf("*** invalid address %p ***", val_ptr); + break; + } } - else dbg_printf("%p", val_ptr); + dbg_printf("%p", val_ptr); break; case SymTagArrayType: case SymTagUDT:

1 0