March 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Handle error conditions better in RemoveContextFromArray().
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 4e2c87dd22cae51c6f27521fc3061150f06f2595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2c87dd22cae51c6f27521fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 9 14:31:28 2009 +0100 wined3d: Handle error conditions better in RemoveContextFromArray(). --- dlls/wined3d/context.c | 55 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 37 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3258909..6353aa7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -919,31 +919,50 @@ out: * *****************************************************************************/ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *context) { - UINT t, s; - WineD3DContext **oldArray = This->contexts; + WineD3DContext **new_array; + BOOL found = FALSE; + UINT i; TRACE("Removing ctx %p\n", context); - This->numContexts--; - - if(This->numContexts) { - This->contexts = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->contexts) * This->numContexts); - if(!This->contexts) { - ERR("Cannot allocate a new context array, PANIC!!!\n"); - } - t = 0; - /* Note that we decreased numContexts a few lines up, so use '<=' instead of '<' */ - for(s = 0; s <= This->numContexts; s++) { - if(oldArray[s] == context) continue; - This->contexts[t] = oldArray[s]; - t++; + for (i = 0; i < This->numContexts; ++i) + { + if (This->contexts[i] == context) + { + HeapFree(GetProcessHeap(), 0, context); + found = TRUE; + break; } - } else { + } + + if (!found) + { + ERR("Context %p doesn't exist in context array\n", context); + return; + } + + while (i < This->numContexts - 1) + { + This->contexts[i] = This->contexts[i + 1]; + ++i; + } + + --This->numContexts; + if (!This->numContexts) + { + HeapFree(GetProcessHeap(), 0, This->contexts); This->contexts = NULL; + return; } - HeapFree(GetProcessHeap(), 0, context); - HeapFree(GetProcessHeap(), 0, oldArray); + new_array = HeapReAlloc(GetProcessHeap(), 0, This->contexts, This->numContexts * sizeof(*This->contexts)); + if (!new_array) + { + ERR("Failed to shrink context array. Oh well.\n"); + return; + } + + This->contexts = new_array; } /*****************************************************************************

1 0

Henri Verbeet : wined3d: Use shader_glsl_get_write_mask_size() to calculate the write mask size.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 695c69f6a0a4a1953dabe1bf42c4585a4854b037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=695c69f6a0a4a1953dabe1bf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 9 14:31:28 2009 +0100 wined3d: Use shader_glsl_get_write_mask_size() to calculate the write mask size. --- dlls/wined3d/glsl_shader.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6d82a6a..88c78d2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2492,6 +2492,7 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + UINT mask_size; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, &src0_param); @@ -2501,8 +2502,10 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) * It is a dependent read - not valid with conditional NP2 textures */ shader_glsl_get_sample_function(sampler_type, 0, &sample_function); + mask_size = shader_glsl_get_write_mask_size(sample_function.coord_mask); - switch(count_bits(sample_function.coord_mask)) { + switch(mask_size) + { case 1: sprintf(coord_param, "dot(gl_TexCoord[%u].xyz, %s)", sampler_idx, src0_param.param_str); @@ -2517,8 +2520,10 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) sprintf(coord_param, "vec3(dot(gl_TexCoord[%u].xyz, %s), 0.0, 0.0)", sampler_idx, src0_param.param_str); break; + default: - FIXME("Unexpected mask bitcount %d\n", count_bits(sample_function.coord_mask)); + FIXME("Unexpected mask size %u\n", mask_size); + break; } shader_glsl_gen_sample_code(arg, sampler_idx, coord_param, &sample_function, WINED3DVS_NOSWIZZLE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 846a15a..add283a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2099,7 +2099,6 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize /* Math utils */ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); -unsigned int count_bits(unsigned int mask); UINT wined3d_log2i(UINT32 x); /* TODO: Make this dynamic, based on shader limits ? */

1 0

Henri Verbeet : wined3d: Buffer object ID's are supposed to be unsigned.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: a3df4767069273ca64d2a2b59a47efc53993bb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3df4767069273ca64d2a2b59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 9 14:31:28 2009 +0100 wined3d: Buffer object ID's are supposed to be unsigned. --- dlls/wined3d/state.c | 8 ++++---- include/wine/wined3d.idl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c791081..d26f5f1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3047,7 +3047,7 @@ static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { } } -static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, const WineDirect3DVertexStridedData *sd, GLint *curVBO) +static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, const WineDirect3DVertexStridedData *sd, GLuint *curVBO) { const UINT *offset = stateblock->streamOffset; unsigned int mapped_stage = 0; @@ -3251,7 +3251,7 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine * and do all the things linked to it * TODO: Tidy that up to reload only the arrays of the changed unit */ - GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; + GLuint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? ~0U : 0; unloadTexCoords(stateblock); loadTexCoords(stateblock, &stateblock->wineD3DDevice->strided_streams, &curVBO); @@ -3839,7 +3839,7 @@ static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock, Wine static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, const WineDirect3DVertexStridedData *strided, WineD3DContext *context) { - GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; + GLuint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? ~0U : 0; int i; const UINT *offset = stateblock->streamOffset; struct wined3d_buffer *vb; @@ -4014,7 +4014,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const WineDirect3DVertexStridedData *sd) { const UINT *offset = stateblock->streamOffset; - GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; + GLuint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? ~0U : 0; TRACE("Using fast vertex array code\n"); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index e2aab21..b2ecfa0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1921,7 +1921,7 @@ typedef struct WineDirect3DStridedData const BYTE *lpData; /* Pointer to start of data */ DWORD dwStride; /* Stride between occurrences of this data */ DWORD dwType; /* Type (as in D3DVSDT_TYPE) */ - int VBO; /* Vertex buffer object this data is in */ + unsigned int VBO; /* Vertex buffer object this data is in */ UINT streamNo; /* D3D stream number */ } WineDirect3DStridedData;

1 0

Henri Verbeet : wined3d: Don't compare texUnitMap entries to -1.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 4ff5736edf6f3a0b6f6db295f1650543846cc898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff5736edf6f3a0b6f6db295f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 9 14:31:28 2009 +0100 wined3d: Don't compare texUnitMap entries to -1. --- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/device.c | 3 ++- dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/nvidia_texture_shader.c | 8 +++++--- dlls/wined3d/state.c | 19 ++++++++++++------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 7 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 5555208..a8c137f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -834,7 +834,8 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi */ for(i = 0; i < desc->num_textures_used; i++) { mapped_stage = This->texUnitMap[i]; - if(mapped_stage != -1) { + if (mapped_stage != WINED3D_UNMAPPED_STAGE) + { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); texture_activate_dimensions(i, stateblock, context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d21b132..63f7352 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4059,7 +4059,8 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) { int vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; if (vshader_sampler_tokens[i]) { - if (This->texUnitMap[vsampler_idx] != -1) { + if (This->texUnitMap[vsampler_idx] != WINED3D_UNMAPPED_STAGE) + { /* Already mapped somewhere */ continue; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3a89f74..6d82a6a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -189,8 +189,9 @@ static void shader_glsl_load_psamplers(const WineD3D_GL_Info *gl_info, IWineD3DS snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); if (name_loc != -1) { - int mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i]; - if (mapped_unit != -1 && mapped_unit < GL_LIMITS(fragment_samplers)) { + DWORD mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i]; + if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < GL_LIMITS(fragment_samplers)) + { TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); checkGLcall("glUniform1iARB"); @@ -212,8 +213,9 @@ static void shader_glsl_load_vsamplers(const WineD3D_GL_Info *gl_info, IWineD3DS snprintf(sampler_name, sizeof(sampler_name), "Vsampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); if (name_loc != -1) { - int mapped_unit = stateBlock->wineD3DDevice->texUnitMap[MAX_FRAGMENT_SAMPLERS + i]; - if (mapped_unit != -1 && mapped_unit < GL_LIMITS(combined_samplers)) { + DWORD mapped_unit = stateBlock->wineD3DDevice->texUnitMap[MAX_FRAGMENT_SAMPLERS + i]; + if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < GL_LIMITS(combined_samplers)) + { TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); checkGLcall("glUniform1iARB"); diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index fc727d6..f7e331d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -462,7 +462,8 @@ static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); - if (mapped_stage != -1) { + if (mapped_stage != WINED3D_UNMAPPED_STAGE) + { if (tex_used && mapped_stage >= GL_LIMITS(textures)) { FIXME("Attempt to enable unsupported stage!\n"); return; @@ -479,7 +480,8 @@ static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 } if(stage >= stateblock->lowest_disabled_stage) { TRACE("Stage disabled\n"); - if (mapped_stage != -1) { + if (mapped_stage != WINED3D_UNMAPPED_STAGE) + { /* Disable everything here */ glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); @@ -548,7 +550,7 @@ static void nvts_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop * will take care of this business */ - if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; + if(mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= GL_LIMITS(textures)) return; if(sampler >= stateblock->lowest_disabled_stage) return; if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d26f5f1..c8f252f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2852,7 +2852,8 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); - if (mapped_stage != -1) { + if (mapped_stage != WINED3D_UNMAPPED_STAGE) + { if (tex_used && mapped_stage >= GL_LIMITS(textures)) { FIXME("Attempt to enable unsupported stage!\n"); return; @@ -2863,7 +2864,8 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D if(stage >= stateblock->lowest_disabled_stage) { TRACE("Stage disabled\n"); - if (mapped_stage != -1) { + if (mapped_stage != WINED3D_UNMAPPED_STAGE) + { /* Disable everything here */ glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); @@ -2904,7 +2906,8 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext TRACE("Setting alpha op for stage %d\n", stage); /* Do not care for enabled / disabled stages, just assign the settings. colorop disables / enables required stuff */ - if (mapped_stage != -1) { + if (mapped_stage != WINED3D_UNMAPPED_STAGE) + { if (tex_used && mapped_stage >= GL_LIMITS(textures)) { FIXME("Attempt to enable unsupported stage!\n"); return; @@ -3008,7 +3011,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W return; } - if (mapped_stage == -1) return; + if (mapped_stage == WINED3D_UNMAPPED_STAGE) return; if(mapped_stage >= GL_LIMITS(textures)) { return; @@ -3057,7 +3060,7 @@ static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, const WineDirect3D int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; - if (mapped_stage == -1) continue; + if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; if (coordIdx < MAX_TEXTURES && (sd->u.s.texCoords[coordIdx].lpData || sd->u.s.texCoords[coordIdx].VBO)) { TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", @@ -3101,7 +3104,8 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine static const GLfloat r_plane[] = { 0.0, 0.0, 1.0, 0.0 }; static const GLfloat q_plane[] = { 0.0, 0.0, 0.0, 1.0 }; - if (mapped_stage == -1) { + if (mapped_stage == WINED3D_UNMAPPED_STAGE) + { TRACE("No texture unit mapped to stage %d. Skipping texture coordinates.\n", stage); return; } @@ -3341,7 +3345,8 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont * only has to bind textures and set the per texture states */ - if (mapped_stage == -1) { + if (mapped_stage == WINED3D_UNMAPPED_STAGE) + { TRACE("No sampler mapped to stage %d. Returning.\n", sampler); return; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5fa4a1f..6d19010 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2385,7 +2385,7 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop * will take care of this business */ - if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; + if(mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= GL_LIMITS(textures)) return; if(sampler >= stateblock->lowest_disabled_stage) return; if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7aa4eb4..b905aea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1039,6 +1039,8 @@ void dumpResources(struct list *list); /***************************************************************************** * IWineD3DDevice implementation structure */ +#define WINED3D_UNMAPPED_STAGE ~0U + struct IWineD3DDeviceImpl { /* IUnknown fields */

1 0

Henri Verbeet : wined3d: Don't compare const_num against -1.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 362bc0d694cefaeacc58a053b942dfae017e95e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362bc0d694cefaeacc58a053b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 9 14:31:28 2009 +0100 wined3d: Don't compare const_num against -1. --- dlls/wined3d/arb_program_shader.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b05b541..8d63294 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -212,7 +212,8 @@ static void shader_arb_load_constants( GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, psi->bumpenvmatconst[i].const_num, data)); deviceImpl->activeContext->pshader_const_dirty[psi->bumpenvmatconst[i].const_num] = 1; - if(psi->luminanceconst[i].const_num != -1) { + if (psi->luminanceconst[i].const_num != WINED3D_CONST_NUM_UNUSED) + { /* WINED3DTSS_BUMPENVLSCALE and WINED3DTSS_BUMPENVLOFFSET are next to each other. * point gl to the scale, and load 4 floats. x = scale, y = offset, z and w are junk, we * don't care about them. The pointers are valid for sure because the stateblock is bigger. @@ -777,7 +778,9 @@ static void pshader_hw_bem(const SHADER_OPCODE_ARG *arg) int i; for(i = 0; i < This->numbumpenvmatconsts; i++) { - if(This->bumpenvmatconst[i].const_num != -1 && This->bumpenvmatconst[i].texunit == sampler_code) { + if (This->bumpenvmatconst[i].const_num != WINED3D_CONST_NUM_UNUSED + && This->bumpenvmatconst[i].texunit == sampler_code) + { has_bumpmat = TRUE; break; } @@ -1232,13 +1235,17 @@ static void pshader_hw_texbem(const SHADER_OPCODE_ARG *arg) pshader_get_register_name(arg->shader, dst, reg_coord); for(i = 0; i < This->numbumpenvmatconsts; i++) { - if(This->bumpenvmatconst[i].const_num != -1 && reg_dest_code == This->bumpenvmatconst[i].texunit) { + if (This->bumpenvmatconst[i].const_num != WINED3D_CONST_NUM_UNUSED + && reg_dest_code == This->bumpenvmatconst[i].texunit) + { has_bumpmat = TRUE; break; } } for(i = 0; i < This->numbumpenvmatconsts; i++) { - if(This->luminanceconst[i].const_num != -1 && reg_dest_code == This->luminanceconst[i].texunit) { + if (This->luminanceconst[i].const_num != WINED3D_CONST_NUM_UNUSED + && reg_dest_code == This->luminanceconst[i].texunit) + { has_luminance = TRUE; break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b905aea..846a15a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -435,6 +435,8 @@ enum vertexprocessing_mode { pretransformed }; +#define WINED3D_CONST_NUM_UNUSED ~0U + struct stb_const_desc { char texunit; UINT const_num;

1 0

Jim Cameron : regedit: Fix crash importing large values from Unicode.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 5bd7e306b47b16a5c5c9edc1b3980b504aca47d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd7e306b47b16a5c5c9edc1b… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Sun Mar 8 15:45:54 2009 +0000 regedit: Fix crash importing large values from Unicode. --- programs/regedit/regproc.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 47f9832..55b0d5f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -732,12 +732,14 @@ static void processRegLinesW(FILE *in) ULONG lineSize = REG_VAL_BUF_SIZE; size_t CharsInBuf = -1; - WCHAR* s; /* The pointer into line for where the current fgets should read */ + WCHAR* s; /* The pointer into buf for where the current fgets should read */ + WCHAR* line; /* The start of the current line */ buf = HeapAlloc(GetProcessHeap(), 0, lineSize * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(buf); s = buf; + line = buf; while(!feof(in)) { size_t size_remaining; @@ -757,6 +759,7 @@ static void processRegLinesW(FILE *in) new_buffer = NULL; CHECK_ENOUGH_MEMORY(new_buffer); buf = new_buffer; + line = buf; s = buf + lineSize - size_remaining; lineSize = new_size; size_remaining = lineSize - (s-buf); @@ -787,14 +790,21 @@ static void processRegLinesW(FILE *in) /* If we didn't read the eol nor the eof go around for the rest */ while(1) { - s_eol = strchrW(s, '\n'); - - if(!s_eol) + s_eol = strchrW(line, '\n'); + + if(!s_eol) { + /* Move the stub of the line to the start of the buffer so + * we get the maximum space to read into, and so we don't + * have to recalculate 'line' if the buffer expands */ + MoveMemory(buf, line, (strlenW(line)+1) * sizeof(WCHAR)); + line = buf; + s = strchrW(line, '\0'); break; + } /* If it is a comment line then discard it and go around again */ - if (*s == '#') { - s = s_eol + 1; + if (*line == '#') { + line = s_eol + 1; continue; } @@ -811,7 +821,7 @@ static void processRegLinesW(FILE *in) if(*(s_eol-1) == '\r') s_eol--; - MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - buf) + 1)*sizeof(WCHAR)); + MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); CharsInBuf -= NextLine - s_eol + 1; s_eol = 0; continue; @@ -827,8 +837,8 @@ static void processRegLinesW(FILE *in) if(!s_eol) break; - processRegEntry(s, TRUE); - s = s_eol + 1; + processRegEntry(line, TRUE); + line = s_eol + 1; s_eol = 0; continue; /* That is the full virtual line */ }

1 0

Huw Davies : gdi32/tests: win9x doesn' t return the correct number of colours used with dib sections created via DIB_PAL_COLORS .
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: a88e6e018215933a39c8ab0e35cffb10e35875d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88e6e018215933a39c8ab0e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 9 12:09:32 2009 +0000 gdi32/tests: win9x doesn't return the correct number of colours used with dib sections created via DIB_PAL_COLORS. --- dlls/gdi32/tests/bitmap.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index b53d217..d25352e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -721,7 +721,8 @@ static void test_dibsections(void) hdib = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection failed\n"); ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIB Section\n"); - ok(dibsec.dsBmih.biClrUsed == 2, + ok(dibsec.dsBmih.biClrUsed == 2 || + broken(dibsec.dsBmih.biClrUsed == 0), /* win9x */ "created DIBSection: wrong biClrUsed field: %u, should be: %u\n", dibsec.dsBmih.biClrUsed, 2); /* The colour table has already been grabbed from the dc, so we select back the @@ -813,7 +814,8 @@ static void test_dibsections(void) hdib = CreateDIBSection(hdc, pbmi, DIB_PAL_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection failed\n"); ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIB Section\n"); - ok(dibsec.dsBmih.biClrUsed == 256, + ok(dibsec.dsBmih.biClrUsed == 256 || + broken(dibsec.dsBmih.biClrUsed == 0), /* win9x */ "created DIBSection: wrong biClrUsed field: %u, should be: %u\n", dibsec.dsBmih.biClrUsed, 256); test_dib_info(hdib, bits, &pbmi->bmiHeader);

1 0

Paul Vriens : shlwapi/tests: Fix failures on systems with IE5.5 or earlier.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 6c62a107a224c0009f3cc85331b14a80c8a9f011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c62a107a224c0009f3cc8533… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 9 11:20:35 2009 +0100 shlwapi/tests: Fix failures on systems with IE5.5 or earlier. --- dlls/shlwapi/tests/shreg.c | 52 +++++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index f088c2e..00cec4f 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -122,8 +122,12 @@ static void test_SHGetValue(void) dwType = -1; dwRet = SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &dwType, buf, &dwSize); ok( ERROR_SUCCESS == dwRet, "SHGetValueA failed, ret=%u\n", dwRet); - ok( 0 == strcmp(sExpTestpath1, buf), "Comparing of (%s) with (%s) failed\n", buf, sExpTestpath1); - ok( REG_SZ == dwType, "Expected REG_SZ, got (%u)\n", dwType); + ok( 0 == strcmp(sExpTestpath1, buf) || + broken(0 == strcmp(sTestpath1, buf)), /* IE4.x */ + "Comparing of (%s) with (%s) failed\n", buf, sExpTestpath1); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* IE4.x */ + "Expected REG_SZ, got (%u)\n", dwType); strcpy(buf, sEmptyBuffer); dwSize = MAX_PATH; @@ -196,7 +200,9 @@ static void test_SHQUeryValueEx(void) dwSize = 6; dwRet = SHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &dwSize); ok( ERROR_SUCCESS == dwRet, "%s failed, ret=%u\n", sTestedFunction, dwRet); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* < IE4.x */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); /* * Case 1 string shrinks during expanding @@ -208,7 +214,9 @@ static void test_SHQUeryValueEx(void) ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); ok( 0 == strcmp(sEmptyBuffer, buf) , "Comparing (%s) with (%s) failed\n", buf, sEmptyBuffer); ok( dwSize == nUsedBuffer1, "Buffer sizes (%u) and (%u) are not equal\n", dwSize, nUsedBuffer1); - ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* < IE6 */ + "Expected REG_SZ, got (%u)\n", dwType); /* * string grows during expanding @@ -220,8 +228,12 @@ static void test_SHQUeryValueEx(void) dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); ok( 0 == strcmp(sEmptyBuffer, buf) , "Comparing (%s) with (%s) failed\n", buf, sEmptyBuffer); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); - ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* < IE6 */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* < IE6 */ + "Expected REG_SZ, got (%u)\n", dwType); /* * string grows during expanding @@ -233,7 +245,10 @@ static void test_SHQUeryValueEx(void) dwSize = strlen(sEnvvar2) - 2; dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); - ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); + ok( ERROR_MORE_DATA == dwRet || + broken(ERROR_ENVVAR_NOT_FOUND == dwRet) || /* IE5.5 */ + broken(ERROR_SUCCESS == dwRet), /* < IE5.5*/ + "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); todo_wine { @@ -241,7 +256,9 @@ static void test_SHQUeryValueEx(void) "Expected empty or unexpanded string (win98), got (%s)\n", buf); } - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen("") + 1)), /* < IE 5.5 */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); /* @@ -254,15 +271,22 @@ static void test_SHQUeryValueEx(void) dwSize = nExpLen2 - 4; dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); - ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); + ok( ERROR_MORE_DATA == dwRet || + broken(ERROR_ENVVAR_NOT_FOUND == dwRet) || /* IE5.5 */ + broken(ERROR_SUCCESS == dwRet), /* < IE5.5 */ + "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); todo_wine { - ok( (0 == strcmp("", buf)) || (0 == strcmp(sEnvvar2, buf)), - "Expected empty or first part of the string \"%s\", got \"%s\"\n", sEnvvar2, buf); + ok( (0 == strcmp("", buf)) || (0 == strcmp(sEnvvar2, buf)) || + broken(0 == strcmp(sTestpath2, buf)), /* IE 5.5 */ + "Expected empty or first part of the string \"%s\", got \"%s\"\n", sEnvvar2, buf); } - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sEnvvar2) + 1)) || /* IE4.01 SP1 (W98) and IE5 (W98SE) */ + broken(dwSize == (strlen("") + 1)), /* IE4.01 (NT4) and IE5.x (W2K) */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); /* @@ -273,7 +297,9 @@ static void test_SHQUeryValueEx(void) dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, NULL, &dwSize); ok( ERROR_SUCCESS == dwRet, "%s failed, ret=%u\n", sTestedFunction, dwRet); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* IE4.01 SP1 (Win98) */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); RegCloseKey(hKey);

1 0

Paul Vriens : shell32/tests: Don't crash on missing class implementations.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: c88aea3b0c61209f6aa45d0f5dabb5df5fe72f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88aea3b0c61209f6aa45d0f5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 9 14:08:52 2009 +0100 shell32/tests: Don't crash on missing class implementations. --- dlls/shell32/tests/autocomplete.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 782fc35..20315c7 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -33,7 +33,7 @@ static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; -static void test_init(void) { +static BOOL test_init(void) { HRESULT r; IAutoComplete* ac; IUnknown *acSource; @@ -41,16 +41,28 @@ static void test_init(void) { /* AutoComplete instance */ r = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete, (LPVOID*)&ac); + if (r == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_AutoComplete is not registered\n"); + return FALSE; + } ok(SUCCEEDED(r), "no IID_IAutoComplete (0x%08x)\n", r); /* AutoComplete source */ r = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC_SERVER, &IID_IACList, (LPVOID*)&acSource); + if (r == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_ACLMulti is not registered\n"); + return FALSE; + } ok(SUCCEEDED(r), "no IID_IACList (0x%08x)\n", r); /* bind to edit control */ r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); ok(SUCCEEDED(r), "Init failed (0x%08x)\n", r); + + return TRUE; } static void test_killfocus(void) { /* Test if WM_KILLFOCUS messages are handled properly by checking if @@ -106,7 +118,8 @@ START_TEST(autocomplete) { if(!ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n")) return; - test_init(); + if (!test_init()) + goto cleanup; test_killfocus(); PostQuitMessage(0); @@ -115,6 +128,7 @@ START_TEST(autocomplete) { DispatchMessageA(&msg); } +cleanup: DestroyWindow(hEdit); DestroyWindow(hMainWnd);

1 0

Huw Davies : gdi32/tests: Fix another case where win9x returns bmType equal to 0x5250.
by Alexandre Julliard March 9, 2009

March 9, 2009

Module: wine Branch: master Commit: 5ccf92f512860d6376507cdbfac2554894ff4f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf92f512860d6376507cdbf… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 9 12:14:53 2009 +0000 gdi32/tests: Fix another case where win9x returns bmType equal to 0x5250. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d25352e..9e2f0c9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1906,7 +1906,9 @@ static void test_select_object(void) memset(&bm, 0xAA, sizeof(bm)); bytes = GetObject(hbm, sizeof(bm), &bm); ok(bytes == sizeof(bm), "GetObject returned %d\n", bytes); - ok(bm.bmType == 0, "wrong bmType %d\n", bm.bmType); + ok(bm.bmType == 0 || + broken(bm.bmType == 21072), /* win9x */ + "wrong bmType %d\n", bm.bmType); ok(bm.bmWidth == 10, "wrong bmWidth %d\n", bm.bmWidth); ok(bm.bmHeight == 10, "wrong bmHeight %d\n", bm.bmHeight); ok(bm.bmWidthBytes == BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), "wrong bmWidthBytes %d\n", bm.bmWidthBytes);

1 0