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

Henri Verbeet : wined3d: Replace find_clip_texcoord() with a generic function for finding a free input register.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: d90049131009dc869313a44f246c012f6416a04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90049131009dc869313a44f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 09:39:09 2009 +0200 wined3d: Replace find_clip_texcoord() with a generic function for finding a free input register. --- dlls/wined3d/arb_program_shader.c | 49 +++++++------------------------------ dlls/wined3d/baseshader.c | 9 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 19 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d1ac9a..3e3c124 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3472,9 +3472,9 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct next_local += fixup->super.num_consts; } - if(shader_priv->clipplane_emulation) + if (shader_priv->clipplane_emulation != ~0U) { - shader_addline(buffer, "KIL fragment.texcoord[%u];\n", shader_priv->clipplane_emulation - 1); + shader_addline(buffer, "KIL fragment.texcoord[%u];\n", shader_priv->clipplane_emulation); } /* Base Shader Body */ @@ -3912,42 +3912,6 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct return ret; } -static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps) -{ - struct arb_pshader_private *shader_priv = ps->backend_priv; - int i; - const struct wined3d_gl_info *gl_info = &((IWineD3DDeviceImpl *)ps->baseShader.device)->adapter->gl_info; - - /* See if we can use fragment.texcoord[7] for clipplane emulation - * - * Don't do this if it is not supported, or fragment.texcoord[7] is used - */ - if(ps->baseShader.reg_maps.shader_version.major < 3) - { - for(i = GL_LIMITS(texture_stages); i > 0; i--) - { - if (!(ps->baseShader.reg_maps.texcoord & (1 << (i - 1)))) - { - shader_priv->clipplane_emulation = i; - return; - } - } - WARN("Did not find a free clip reg(2.0)\n"); - } - else - { - for(i = GL_LIMITS(texture_stages); i > 0; i--) - { - if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) - { - shader_priv->clipplane_emulation = i; - return; - } - } - WARN("Did not find a free clip reg(3.0)\n"); - } -} - /* GL locking is done by the caller */ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl *shader, const struct arb_ps_compile_args *args) { @@ -3960,6 +3924,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * if(!shader->backend_priv) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) shader->baseShader.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct shader_arb_priv *priv = device->shader_priv; shader->backend_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*shader_data)); @@ -3972,7 +3937,11 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * shader_data->has_signature_idx = TRUE; TRACE("Shader got assigned input signature index %u\n", shader_data->input_signature_idx); - if(!device->vs_clipping) find_clip_texcoord(shader); + if (!device->vs_clipping) + shader_data->clipplane_emulation = shader_find_free_input_register(&shader->baseShader.reg_maps, + GL_LIMITS(texture_stages) - 1); + else + shader_data->clipplane_emulation = ~0U; } shader_data = shader->backend_priv; @@ -4157,7 +4126,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW struct arb_pshader_private *shader_priv = ps->backend_priv; args->ps_signature = shader_priv->input_signature_idx; - args->boolclip.clip_control[0] = shader_priv->clipplane_emulation; + args->boolclip.clip_control[0] = shader_priv->clipplane_emulation + 1; } else { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 60d2c53..c983e80 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -769,6 +769,15 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 return WINED3D_OK; } +unsigned int shader_find_free_input_register(const struct shader_reg_maps *reg_maps, unsigned int max) +{ + DWORD map = 1 << max; + map |= map - 1; + map &= reg_maps->shader_version.major < 3 ? ~reg_maps->texcoord : ~reg_maps->input_registers; + + return wined3d_log2i(map); +} + static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semantic, const struct wined3d_shader_version *shader_version) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f88afd..514c9a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2644,6 +2644,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, const struct wined3d_shader_version *shader_version); void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version); +unsigned int shader_find_free_input_register(const struct shader_reg_maps *reg_maps, unsigned int max); void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffer *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx); HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe,

1 0

Henri Verbeet : wined3d: Remove a redundant IWineD3DDeviceImpl_MarkStateDirty() call.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 8d0ad2cf36a1ca4eaa2b408d33c2eb7d54bacd68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0ad2cf36a1ca4eaa2b408d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 09:39:08 2009 +0200 wined3d: Remove a redundant IWineD3DDeviceImpl_MarkStateDirty() call. We should now correctly track the relevant state per-context. The IWineD3DDeviceImpl_SetViewport() call isn't quite correct for d3d8 and d3d9, Stefan still has a patch for that. --- dlls/wined3d/device.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6afd5da..5d77931 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6567,10 +6567,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, viewport.MaxZ = 1.0f; viewport.MinZ = 0.0f; IWineD3DDeviceImpl_SetViewport(iface, &viewport); - /* Make sure the viewport state is dirty, because the render_offscreen thing affects it. - * SetViewport may catch NOP viewport changes, which would occur when switching between equally sized targets - */ - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); } return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Use WINED3D_UNMAPPED_STAGE in some more places.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: b8078fc747e73e0437ab2f46447c958d7526d4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8078fc747e73e0437ab2f464… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 09:39:07 2009 +0200 wined3d: Use WINED3D_UNMAPPED_STAGE in some more places. --- dlls/wined3d/context.c | 9 ++++++--- dlls/wined3d/device.c | 44 ++++++++++++++++++++++++-------------------- dlls/wined3d/drawprim.c | 6 +++--- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- 5 files changed, 39 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 09743c6..87416b7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1513,9 +1513,10 @@ static inline void set_blit_dimension(UINT width, UINT height) { /* Context activation is done by the caller. */ static inline void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *context, UINT width, UINT height) { - int i, sampler; + int i; const struct StateEntry *StateTable = This->StateTable; const struct wined3d_gl_info *gl_info = context->gl_info; + DWORD sampler; TRACE("Setting up context %p for blitting\n", context); if(context->last_was_blit) { @@ -1578,7 +1579,8 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);"); - if (sampler != -1) { + if (sampler != WINED3D_UNMAPPED_STAGE) + { if (sampler < MAX_TEXTURES) { Context_MarkStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP), StateTable); } @@ -1617,7 +1619,8 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ..."); } - if (sampler != -1) { + if (sampler != WINED3D_UNMAPPED_STAGE) + { if (sampler < MAX_TEXTURES) { Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + sampler), StateTable); Context_MarkStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP), StateTable); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 256d6dc..6afd5da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2113,8 +2113,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, This->texUnitMap[state] = state; This->rev_tex_unit_map[state] = state; } else { - This->texUnitMap[state] = -1; - This->rev_tex_unit_map[state] = -1; + This->texUnitMap[state] = WINED3D_UNMAPPED_STAGE; + This->rev_tex_unit_map[state] = WINED3D_UNMAPPED_STAGE; } } @@ -3635,18 +3635,21 @@ static inline void markTextureStagesDirty(IWineD3DDeviceImpl *This, DWORD stage) } } -static void device_map_stage(IWineD3DDeviceImpl *This, int stage, int unit) { - int i = This->rev_tex_unit_map[unit]; - int j = This->texUnitMap[stage]; +static void device_map_stage(IWineD3DDeviceImpl *This, DWORD stage, DWORD unit) +{ + DWORD i = This->rev_tex_unit_map[unit]; + DWORD j = This->texUnitMap[stage]; This->texUnitMap[stage] = unit; - if (i != -1 && i != stage) { - This->texUnitMap[i] = -1; + if (i != WINED3D_UNMAPPED_STAGE && i != stage) + { + This->texUnitMap[i] = WINED3D_UNMAPPED_STAGE; } This->rev_tex_unit_map[unit] = stage; - if (j != -1 && j != unit) { - This->rev_tex_unit_map[j] = -1; + if (j != WINED3D_UNMAPPED_STAGE && j != unit) + { + This->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; } } @@ -3740,14 +3743,12 @@ static void device_map_psamplers(IWineD3DDeviceImpl *This) { } static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshader_sampler_tokens, - const DWORD *vshader_sampler_tokens, int unit) + const DWORD *vshader_sampler_tokens, DWORD unit) { - int current_mapping = This->rev_tex_unit_map[unit]; + DWORD current_mapping = This->rev_tex_unit_map[unit]; - if (current_mapping == -1) { - /* Not currently used */ - return TRUE; - } + /* Not currently used */ + if (current_mapping == WINED3D_UNMAPPED_STAGE) return TRUE; if (current_mapping < MAX_FRAGMENT_SAMPLERS) { /* Used by a fragment sampler */ @@ -3781,7 +3782,7 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { } for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) { - int vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; + DWORD vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; if (vshader_sampler_type[i]) { if (This->texUnitMap[vsampler_idx] != WINED3D_UNMAPPED_STAGE) @@ -5731,7 +5732,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ const struct GlPixelFormatDesc *src_format_desc, *dst_format_desc; GLenum dummy; - int sampler; + DWORD sampler; int bpp; CONVERT_TYPES convert = NO_CONVERSION; @@ -5871,7 +5872,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurface_ModifyLocation(pDestinationSurface, SFLAG_INTEXTURE, TRUE); sampler = This->rev_tex_unit_map[0]; - if (sampler != -1) { + if (sampler != WINED3D_UNMAPPED_STAGE) + { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(sampler)); } @@ -6680,7 +6682,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i INT height = This->cursorHeight; INT width = This->cursorWidth; INT bpp = glDesc->byte_count; - INT i, sampler; + DWORD sampler; + INT i; /* Reformat the texture memory (pitch and width can be * different) */ @@ -6702,7 +6705,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); sampler = This->rev_tex_unit_map[0]; - if (sampler != -1) { + if (sampler != WINED3D_UNMAPPED_STAGE) + { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(sampler)); } /* Create a new cursor texture */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9a5aef7..a2a4620 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -164,7 +164,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context for (textureNo = 0; textureNo < texture_stages; ++textureNo) { int coordIdx = This->stateBlock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; - int texture_idx = This->texUnitMap[textureNo]; + DWORD texture_idx = This->texUnitMap[textureNo]; if (!GL_SUPPORT(ARB_MULTITEXTURE) && textureNo > 0) { @@ -174,7 +174,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context if (!pixelShader && !This->stateBlock->textures[textureNo]) continue; - if (texture_idx == -1) continue; + if (texture_idx == WINED3D_UNMAPPED_STAGE) continue; if (coordIdx > 7) { @@ -232,7 +232,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context { int coord_idx; const void *ptr; - int texture_idx; + DWORD texture_idx; if (!(tmp_tex_mask & 1)) continue; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 781a6b2..865cbc7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -301,7 +301,7 @@ void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) /* Context activation is done by the caller. */ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { - int active_sampler; + DWORD active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. * Read the unit back instead of switching to 0, this avoids messing around with the state manager's @@ -320,7 +320,8 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { LEAVE_GL(); active_sampler = This->resource.wineD3DDevice->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; - if (active_sampler != -1) { + if (active_sampler != WINED3D_UNMAPPED_STAGE) + { IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(active_sampler)); } IWineD3DSurface_BindTexture((IWineD3DSurface *)This, srgb); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 871fdf7..85e8f3a 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); static void volume_bind_and_dirtify(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; IWineD3DVolumeTexture *texture; - int active_sampler; + DWORD active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. * Read the unit back instead of switching to 0, this avoids messing around with the state manager's @@ -53,7 +53,8 @@ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { active_sampler = 0; } - if (active_sampler != -1) { + if (active_sampler != WINED3D_UNMAPPED_STAGE) + { IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(active_sampler)); }

1 0

Henri Verbeet : wined3d: Check the correct vertex sampler in device_unit_free_for_vs().
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 7a0670392c86962ba115d3f888733897f0a4690c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0670392c86962ba115d3f88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 09:39:06 2009 +0200 wined3d: Check the correct vertex sampler in device_unit_free_for_vs(). --- 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 92d6ffd..256d6dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3762,7 +3762,7 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshad } /* Used by a vertex sampler */ - return !vshader_sampler_tokens[current_mapping]; + return !vshader_sampler_tokens[current_mapping - MAX_FRAGMENT_SAMPLERS]; } static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) {

1 0

Henri Verbeet : wined3d: Don' t use a start index higher than MAX_COMBINED_SAMPLERS - 1 in device_map_vsamplers ().
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 8cf7aa2bdd2b953950bcd4d51b0c82646eafc26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf7aa2bdd2b953950bcd4d51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 09:39:05 2009 +0200 wined3d: Don't use a start index higher than MAX_COMBINED_SAMPLERS - 1 in device_map_vsamplers(). --- 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 c9e50d1..92d6ffd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3769,7 +3769,7 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_type = ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.sampler_type; const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_type = NULL; - int start = GL_LIMITS(combined_samplers) - 1; + int start = min(MAX_COMBINED_SAMPLERS, GL_LIMITS(combined_samplers)) - 1; int i; if (ps) {

1 0

Jacek Caban : mshtml: Disable spell checker.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 0936f4aa92f34a37428e4746d9ba842eb1545276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0936f4aa92f34a37428e4746d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 15 19:47:40 2009 +0200 mshtml: Disable spell checker. --- dlls/mshtml/nsembed.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d6e3206..eadbfc7 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -394,6 +394,15 @@ static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) ERR("Could not set pref %s\n", debugstr_a(pref_name)); } +static void set_int_pref(nsIPrefBranch *pref, const char *pref_name, int val) +{ + nsresult nsres; + + nsres = nsIPrefBranch_SetIntPref(pref, pref_name, val); + if(NS_FAILED(nsres)) + ERR("Could not set pref %s\n", debugstr_a(pref_name)); +} + static void set_preferences(void) { nsIPrefBranch *pref; @@ -410,6 +419,7 @@ static void set_preferences(void) set_proxy(pref); set_bool_pref(pref, "security.warn_entering_secure", FALSE); set_bool_pref(pref, "security.warn_submit_insecure", FALSE); + set_int_pref(pref, "layout.spellcheckDefault", 0); nsIPrefBranch_Release(pref); }

1 0

Cheer Xiao : winecfg: Update Chinese translation.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 6a951bc71ddf72a0369438c9db5b64803a58419e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a951bc71ddf72a0369438c9d… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Aug 15 11:47:19 2009 +0800 winecfg: Update Chinese translation. --- programs/winecfg/Zh.rc | 113 ++++++++++++++++++++++++++++-------------------- 1 files changed, 66 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a951bc71ddf72a036943…

1 0

Dylan Smith : wordpad: Use smaller cbSize for REBARBANDINFOW for compatibility.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 19c6edd497480feb99080ec1c8703ba875af0a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c6edd497480feb99080ec1c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Aug 14 22:23:21 2009 -0400 wordpad: Use smaller cbSize for REBARBANDINFOW for compatibility. The cbSize field for the REBARBANDINFOW structure was previously set to the sizeof(REBARBANDINFOW), however, new fields were added to this structure for newer version of windows. Testing in Windows XP (or with comctl32.dll from Windows XP) I found this larger size was rejected causing the rebar to not be displayed in wordpad. --- programs/wordpad/print.c | 4 ++-- programs/wordpad/wordpad.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index a62f955..0a1343f 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -97,7 +97,7 @@ static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id) WS_VISIBLE | WS_CHILD, 5, 5, 100, 15, hRebarWnd, ULongToHandle(command), hInstance, NULL); - rb.cbSize = sizeof(rb); + rb.cbSize = REBARBANDINFOW_V6_SIZE; rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT; rb.hwndChild = hButton; @@ -448,7 +448,7 @@ static void preview_bar_show(HWND hMainWnd, BOOL show) WS_VISIBLE | WS_CHILD, 0, 0, 0, 0, hReBar, NULL, NULL, NULL); - rb.cbSize = sizeof(rb); + rb.cbSize = REBARBANDINFOW_V6_SIZE; rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT; rb.hwndChild = hStatic; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 80a6a07..e4e9ae0 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -644,7 +644,7 @@ static void set_toolbar_state(int bandId, BOOL show) REBARBANDINFOW rbbinfo; int index = SendMessageW(hwndReBar, RB_IDTOINDEX, BANDID_FONTLIST, 0); - rbbinfo.cbSize = sizeof(rbbinfo); + rbbinfo.cbSize = REBARBANDINFOW_V6_SIZE; rbbinfo.fMask = RBBIM_STYLE; SendMessageW(hwndReBar, RB_GETBANDINFO, index, (LPARAM)&rbbinfo); @@ -1795,7 +1795,7 @@ static LRESULT OnCreate( HWND hWnd ) SendMessageW(hToolBarWnd, TB_AUTOSIZE, 0, 0); - rbb.cbSize = sizeof(rbb); + rbb.cbSize = REBARBANDINFOW_V6_SIZE; rbb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_STYLE | RBBIM_ID; rbb.fStyle = RBBS_CHILDEDGE | RBBS_BREAK | RBBS_NOGRIPPER; rbb.cx = 0;

1 0

Dylan Smith : richedit: Fixed check for nOffset at the end of the cursor' s run.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: a8e58307f91aa4515cf0d4bebb2d875b95e22bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e58307f91aa4515cf0d4beb… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Aug 14 22:23:13 2009 -0400 richedit: Fixed check for nOffset at the end of the cursor's run. For some reason the code previously mixed up a selection cursor with the result cursor. The problem seemed to have corrected itself before as a result of conversion between offsets and cursors, but my recent changes made this bug more severe. --- dlls/riched20/caret.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 11c3f1f..096d0d5 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -890,9 +890,9 @@ static BOOL ME_ReturnFoundPos(ME_TextEditor *editor, ME_DisplayItem *found, rx = 0; result->pRun = found; result->nOffset = ME_CharFromPointCursor(editor, rx, &found->member.run); - if (editor->pCursors[0].nOffset == found->member.run.strText->nLen && rx) + if (result->nOffset == found->member.run.strText->nLen && rx) { - result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); + result->pRun = ME_FindItemFwd(result->pRun, diRun); result->nOffset = 0; } result->pPara = ME_GetParagraph(result->pRun);

1 0

Juan Lang : shdocvw: Support URLs passed by reference in WebBrowser_Navigate2.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: a3575824eaee5cc8722c901b4df6fc62ad925ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3575824eaee5cc8722c901b4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 14 10:44:11 2009 -0700 shdocvw: Support URLs passed by reference in WebBrowser_Navigate2. --- dlls/shdocvw/webbrowser.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 5e97961..e54e9ee 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -724,6 +724,7 @@ static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VA VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { WebBrowser *This = WEBBROWSER_THIS(iface); + LPCWSTR url; TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); @@ -733,12 +734,20 @@ static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VA if(!URL) return S_OK; - if(V_VT(URL) != VT_BSTR) { + switch (V_VT(URL)) + { + case VT_BSTR: + url = V_BSTR(URL); + break; + case VT_BSTR|VT_BYREF: + url = *V_BSTRREF(URL); + break; + default: FIXME("Unsupported V_VT(URL) %d\n", V_VT(URL)); return E_INVALIDARG; } - return navigate_url(&This->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); + return navigate_url(&This->doc_host, url, Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI WebBrowser_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf)

1 0