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

Henri Verbeet : wined3d: Make the "luminanceparams" shader_reg_maps member a bitmap.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: f7918b978faaae516e14b0acbe41fb16cc5400bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7918b978faaae516e14b0acb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 09:44:26 2009 +0200 wined3d: Make the "luminanceparams" shader_reg_maps member a bitmap. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec86d41..0d1ac9a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3384,7 +3384,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct i, compiled->bumpenvmatconst[cur].const_num); compiled->numbumpenvmatconsts = cur + 1; - if(!reg_maps->luminanceparams[i]) continue; + if (!(reg_maps->luminanceparams & (1 << i))) continue; compiled->luminanceconst[cur].const_num = next_local++; shader_addline(buffer, "PARAM luminance%d = program.local[%d];\n", @@ -5262,8 +5262,9 @@ static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock if (use_ps(stateblock)) { - if(stage != 0 && - ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.luminanceparams[stage]) { + if (stage != 0 + && (((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.luminanceparams & (1 << stage))) + { /* The pixel shader has to know the luminance offset. Do a constants update if it * isn't scheduled anyway */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 252197c..60d2c53 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -689,7 +689,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 reg_maps->bumpmat |= 1 << dst_param.reg.idx; if (ins.handler_idx == WINED3DSIH_TEXBEML) { - reg_maps->luminanceparams[sampler_code] = TRUE; + reg_maps->luminanceparams |= 1 << dst_param.reg.idx; } } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 16b772e..d0c8713 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -905,7 +905,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); - if (reg_maps->luminanceparams[i]) + if (reg_maps->luminanceparams & (1 << i)) { shader_addline(buffer, "uniform float luminancescale%d;\n", i); shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cb87d73..1448b24 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3368,8 +3368,9 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, s { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - if(stateblock->pixelShader && stage != 0 && - ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.luminanceparams[stage]) { + if (stateblock->pixelShader && stage != 0 + && (((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.luminanceparams & (1 << stage))) + { /* The pixel shader has to know the luminance scale. Do a constants update if it * isn't scheduled anyway */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 32402ab..8df99f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -643,7 +643,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BYTE bumpmat; /* MAX_TEXTURES, 8 */ - BOOL luminanceparams[MAX_TEXTURES]; + BYTE luminanceparams; /* MAX_TEXTURES, 8 */ WORD usesnrm : 1; WORD vpos : 1;

1 0

Henri Verbeet : wined3d: Make the "bumpmat" shader_reg_maps member a bitmap .
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 95bb4c0486a900830ff31cf2d275ecd2f326ec34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95bb4c0486a900830ff31cf2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 09:44:25 2009 +0200 wined3d: Make the "bumpmat" shader_reg_maps member a bitmap. --- dlls/wined3d/arb_program_shader.c | 10 ++++++---- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 7 +++---- dlls/wined3d/state.c | 5 +++-- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 22835b1..ec86d41 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3360,8 +3360,9 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map, NULL, &priv_ctx); - for(i = 0; i < (sizeof(reg_maps->bumpmat) / sizeof(reg_maps->bumpmat[0])); i++) { - if(!reg_maps->bumpmat[i]) continue; + for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; cur = compiled->numbumpenvmatconsts; compiled->bumpenvmatconst[cur].const_num = WINED3D_CONST_NUM_UNUSED; @@ -5224,8 +5225,9 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, s if (use_ps(stateblock)) { - if(stage != 0 && - ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.bumpmat[stage]) { + if (stage != 0 + && (((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.bumpmat & (1 << stage))) + { /* The pixel shader has to know the bump env matrix. Do a constants update if it isn't scheduled * anyway */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3530eab..252197c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -686,7 +686,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 if (ins.handler_idx == WINED3DSIH_TEXBEM || ins.handler_idx == WINED3DSIH_TEXBEML) { - reg_maps->bumpmat[sampler_code] = TRUE; + reg_maps->bumpmat |= 1 << dst_param.reg.idx; if (ins.handler_idx == WINED3DSIH_TEXBEML) { reg_maps->luminanceparams[sampler_code] = TRUE; @@ -695,7 +695,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } else if (ins.handler_idx == WINED3DSIH_BEM) { - reg_maps->bumpmat[dst_param.reg.idx] = TRUE; + reg_maps->bumpmat |= 1 << dst_param.reg.idx; } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8488c29..16b772e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -899,10 +899,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "void order_ps_input();\n"); } } else { - for(i = 0; i < (sizeof(reg_maps->bumpmat) / sizeof(reg_maps->bumpmat[0])); i++) { - if(!reg_maps->bumpmat[i]) { - continue; - } + for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3fc555c..cb87d73 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3529,8 +3529,9 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w static void shader_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - if(stateblock->pixelShader && stage != 0 && - ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.bumpmat[stage]) { + if (stateblock->pixelShader && stage != 0 + && (((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.reg_maps.bumpmat & (1 << stage))) + { /* The pixel shader has to know the bump env matrix. Do a constants update if it isn't scheduled * anyway */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bac13cd..32402ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -642,7 +642,8 @@ typedef struct shader_reg_maps WORD local_bool_consts; /* MAX_CONST_B, 16 */ WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; - BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; + BYTE bumpmat; /* MAX_TEXTURES, 8 */ + BOOL luminanceparams[MAX_TEXTURES]; WORD usesnrm : 1; WORD vpos : 1;

1 0

Henri Verbeet : wined3d: Make the "labels" shader_reg_maps member a bitmap.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 3d718d641485a71095230bf5d67b1907c5d6c7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d718d641485a71095230bf5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 09:44:24 2009 +0200 wined3d: Make the "labels" shader_reg_maps member a bitmap. --- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1fcc8b8..3530eab 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -599,7 +599,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 struct wined3d_shader_src_param src, rel_addr; fe->shader_read_src_param(fe_data, &pToken, &src, &rel_addr); - reg_maps->labels[src.reg.idx] = 1; + reg_maps->labels |= 1 << src.reg.idx; } /* Set texture, address, temporary registers */ else diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 69aa320..8488c29 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -821,9 +821,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont char prefix = pshader ? 'P' : 'V'; /* Prototype the subroutines */ - for (i = 0; i < This->baseShader.limits.label; i++) { - if (reg_maps->labels[i]) - shader_addline(buffer, "void subroutine%u();\n", i); + for (i = 0, map = reg_maps->labels; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); } /* Declare the constants (aka uniforms) */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36c1f17..bac13cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -630,8 +630,8 @@ typedef struct shader_reg_maps struct wined3d_shader_version shader_version; BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ BYTE address; /* MAX_REG_ADDR, 1 */ + WORD labels; /* MAX_LABELS, 16 */ DWORD temporary; /* MAX_REG_TEMP, 32 */ - char labels[MAX_LABELS]; /* pixel, vertex */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ WORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 16 */

1 0

Henri Verbeet : wined3d: Make the "address" shader_reg_maps member a bitmap .
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 270f57e755fd9713a22e98247769ef138dfecb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=270f57e755fd9713a22e98247… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 09:44:23 2009 +0200 wined3d: Make the "address" shader_reg_maps member a bitmap. --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ed3ab72..22835b1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -664,9 +664,9 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if (map & 1) shader_addline(buffer, "TEMP R%u;\n", i); } - for (i = 0; i < This->baseShader.limits.address; i++) { - if (reg_maps->address[i]) - shader_addline(buffer, "ADDRESS A%d;\n", i); + for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "ADDRESS A%u;\n", i); } if (pshader && reg_maps->shader_version.major == 1 && reg_maps->shader_version.minor <= 3) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 12c5fba..1fcc8b8 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -258,7 +258,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh { case WINED3DSPR_TEXTURE: /* WINED3DSPR_ADDR */ if (shader_type == WINED3D_SHADER_TYPE_PIXEL) reg_maps->texcoord |= 1 << reg->idx; - else reg_maps->address[reg->idx] = 1; + else reg_maps->address |= 1 << reg->idx; break; case WINED3DSPR_TEMP: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 33b723a..69aa320 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1004,9 +1004,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare address variables */ - for (i = 0; i < This->baseShader.limits.address; i++) { - if (reg_maps->address[i]) - shader_addline(buffer, "ivec4 A%d;\n", i); + for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + { + if (map & 1) shader_addline(buffer, "ivec4 A%u;\n", i); } /* Declare texture coordinate temporaries and initialize them */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca79262..36c1f17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,8 +629,8 @@ typedef struct shader_reg_maps { struct wined3d_shader_version shader_version; BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ + BYTE address; /* MAX_REG_ADDR, 1 */ DWORD temporary; /* MAX_REG_TEMP, 32 */ - char address[MAX_REG_ADDR]; /* vertex */ char labels[MAX_LABELS]; /* pixel, vertex */ DWORD *constf; /* pixel, vertex */ DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */

1 0

Henri Verbeet : wined3d: Fix swapchain draw buffer cleanup.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 3ec639e38c90166bf2134817c05903320d43d80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec639e38c90166bf2134817c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 09:44:22 2009 +0200 wined3d: Fix swapchain draw buffer cleanup. Destroying the first back buffer before the other ones might cause an already freed surface to be used as target in FindContext(). --- dlls/wined3d/swapchain.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2910ef9..d8d3733 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -45,23 +45,32 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB IWineD3DSwapChain_SetGammaRamp(iface, 0, &This->orig_gamma); - /* release the ref to the front and back buffer parents */ - if(This->frontBuffer) { + /* Release the swapchain's draw buffers. Make sure This->backBuffer[0] is + * the last buffer to be destroyed, FindContext() depends on that. */ + if (This->frontBuffer) + { IWineD3DSurface_SetContainer(This->frontBuffer, 0); - if(D3DCB_DestroyRenderTarget(This->frontBuffer) > 0) { - FIXME("(%p) Something's still holding the front buffer\n",This); + if (D3DCB_DestroyRenderTarget(This->frontBuffer)) + { + FIXME("(%p) Something's still holding the front buffer (%p).\n", + This, This->frontBuffer); } + This->frontBuffer = NULL; } - if(This->backBuffer) { - UINT i; - for(i = 0; i < This->presentParms.BackBufferCount; i++) { + if (This->backBuffer) + { + UINT i = This->presentParms.BackBufferCount; + + while (i--) + { IWineD3DSurface_SetContainer(This->backBuffer[i], 0); - if(D3DCB_DestroyRenderTarget(This->backBuffer[i]) > 0) { - FIXME("(%p) Something's still holding the back buffer\n",This); - } + if (D3DCB_DestroyRenderTarget(This->backBuffer[i])) + FIXME("(%p) Something's still holding back buffer %u (%p).\n", + This, i, This->backBuffer[i]); } HeapFree(GetProcessHeap(), 0, This->backBuffer); + This->backBuffer = NULL; } for (i = 0; i < This->num_contexts; ++i)

1 0

Rein Klazes : user32: Fix a bug in computing the maximum depth of a branch in a menu hierarchy.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 06b99c62c20f1ddb2cc739e1790baf67dd71294b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b99c62c20f1ddb2cc739e17… Author: Rein Klazes <wijn(a)online.nl> Date: Wed Aug 12 07:11:04 2009 +0200 user32: Fix a bug in computing the maximum depth of a branch in a menu hierarchy. It was computing the number of submenus in the branch, rather then the maximum depth. --- dlls/user32/menu.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5299c60..90a6e5a 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4646,18 +4646,22 @@ static int MENU_depth( POPUPMENU *pmenu, int depth) { int i; MENUITEM *item; + int subdepth; depth++; if( depth > MAXMENUDEPTH) return depth; item = pmenu->items; - for( i = 0; i < pmenu->nItems && depth <= MAXMENUDEPTH; i++, item++){ - POPUPMENU *psubmenu = MENU_GetMenu( item->hSubMenu); + subdepth = depth; + for( i = 0; i < pmenu->nItems && subdepth <= MAXMENUDEPTH; i++, item++){ + POPUPMENU *psubmenu = item->hSubMenu ? MENU_GetMenu( item->hSubMenu) : NULL; if( psubmenu){ int bdepth = MENU_depth( psubmenu, depth); - if( bdepth > depth) depth = bdepth; + if( bdepth > subdepth) subdepth = bdepth; } + if( subdepth > MAXMENUDEPTH) + TRACE("<- hmenu %p\n", item->hSubMenu); } - return depth; + return subdepth; }

1 0

Dmitry Timoshkov : winex11.drv: Handle failure of XcursorImageCreate.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 32e3539413e6383dbf91934ec5395a68282ae760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e3539413e6383dbf91934ec… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 12 17:16:48 2009 +0900 winex11.drv: Handle failure of XcursorImageCreate. --- dlls/winex11.drv/mouse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5282412..60351e5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -486,6 +486,8 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) xor_ptr = xor_bits = and_ptr + and_size; image = pXcursorImageCreate( ptr->nWidth, ptr->nHeight ); + if (!image) return NULL; + pixel_ptr = image->pixels; alpha_zero = check_alpha_zero(ptr, xor_bits);

1 0

Dmitry Timoshkov : user32: Return 0 from DefDlgProc and dialog loop for invalid dialog handles.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 96e44ddb78950b55ab45d91fb8a3231c58879294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e44ddb78950b55ab45d91fb… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 12 11:59:38 2009 +0900 user32: Return 0 from DefDlgProc and dialog loop for invalid dialog handles. --- dlls/user32/defdlg.c | 9 ++++++--- dlls/user32/dialog.c | 2 +- dlls/user32/tests/dialog.c | 16 +++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index ee1b58e..6096890 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -345,7 +345,10 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return NULL; + } dlgInfo = wndPtr->dlgInfo; @@ -382,7 +385,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, BOOL result = FALSE; /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info(hwnd32, TRUE))) return -1; + if(!(dlgInfo = DIALOG_get_info(hwnd32, TRUE))) return 0; SetWindowLongPtrW( hwnd32, DWLP_MSGRESULT, 0 ); @@ -433,7 +436,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) BOOL result = FALSE; /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return -1; + if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 ); @@ -484,7 +487,7 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DLGPROC dlgproc; /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return -1; + if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 ); diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 5710807..e8927e9 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -809,7 +809,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (!GetMessageW( &msg, 0, 0, 0 )) break; } - if (!IsWindow( hwnd )) return -1; + if (!IsWindow( hwnd )) return 0; if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg)) { TranslateMessage( &msg ); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8fe1cc4..fd4c225 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -932,12 +932,12 @@ static INT_PTR CALLBACK DestroyOnCloseDlgWinProc (HWND hDlg, UINT uiMsg, static void test_DialogBoxParamA(void) { - int ret; + INT_PTR ret; HWND hwnd_invalid = (HWND)0x4444; SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG" , hwnd_invalid, 0 , 0); - ok(0 == ret || broken(ret == -1), "DialogBoxParamA returned %d, expected 0\n", ret); + ok(0 == ret || broken(ret == -1), "DialogBoxParamA returned %ld, expected 0\n", ret); ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError()); @@ -945,7 +945,7 @@ static void test_DialogBoxParamA(void) /* Test a dialog which destroys itself on WM_INITDIALOG. */ SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyDlgWinProc, 0); - ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret); + ok(-1 == ret, "DialogBoxParamA returned %ld, expected -1\n", ret); ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef), @@ -953,14 +953,20 @@ static void test_DialogBoxParamA(void) /* Test a dialog which destroys itself on WM_CLOSE. */ ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyOnCloseDlgWinProc, 0); - todo_wine ok(0 == ret, "DialogBoxParamA returned %d, expected 0\n", ret); + ok(0 == ret, "DialogBoxParamA returned %ld, expected 0\n", ret); SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "RESOURCE_INVALID" , 0, 0, 0); - ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret); + ok(-1 == ret, "DialogBoxParamA returned %ld, expected -1\n", ret); ok(ERROR_RESOURCE_NAME_NOT_FOUND == GetLastError() || broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); + + SetLastError(0xdeadbeef); + ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); + ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, + "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError()); } static void test_DisabledDialogTest(void)

1 0

Alexandre Julliard : server: Add support for image mappings for both 32- and 64-bit PE formats.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 95d3a722ab355d8f8980d126be7a8fa2d9ca3e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d3a722ab355d8f8980d126b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 12 12:53:16 2009 +0200 server: Add support for image mappings for both 32- and 64-bit PE formats. --- server/mapping.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 20 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 5549a64..a303111 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -303,11 +303,20 @@ static int build_shared_mapping( struct mapping *mapping, int fd, static int get_image_params( struct mapping *mapping ) { IMAGE_DOS_HEADER dos; - IMAGE_NT_HEADERS nt; IMAGE_SECTION_HEADER *sec = NULL; + struct + { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + union + { + IMAGE_OPTIONAL_HEADER32 hdr32; + IMAGE_OPTIONAL_HEADER64 hdr64; + } opt; + } nt; struct fd *fd; off_t pos; - int unix_fd, size, toread; + int unix_fd, size; /* load the headers */ @@ -317,22 +326,34 @@ static int get_image_params( struct mapping *mapping ) if (dos.e_magic != IMAGE_DOS_SIGNATURE) goto error; pos = dos.e_lfanew; - if (pread( unix_fd, &nt.Signature, sizeof(nt.Signature), pos ) != sizeof(nt.Signature)) - goto error; - pos += sizeof(nt.Signature); + size = pread( unix_fd, &nt, sizeof(nt), pos ); + if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) goto error; + /* zero out Optional header in the case it's not present or partial */ + if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size ); if (nt.Signature != IMAGE_NT_SIGNATURE) goto error; - if (pread( unix_fd, &nt.FileHeader, sizeof(nt.FileHeader), pos ) != sizeof(nt.FileHeader)) + + switch (nt.opt.hdr32.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + mapping->size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); + mapping->base = nt.opt.hdr32.ImageBase; + mapping->header_size = nt.opt.hdr32.SizeOfHeaders; + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + mapping->size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); + mapping->base = nt.opt.hdr64.ImageBase; + mapping->header_size = nt.opt.hdr64.SizeOfHeaders; + break; + default: goto error; - pos += sizeof(nt.FileHeader); - /* zero out Optional header in the case it's not present or partial */ - memset(&nt.OptionalHeader, 0, sizeof(nt.OptionalHeader)); - toread = min( sizeof(nt.OptionalHeader), nt.FileHeader.SizeOfOptionalHeader ); - if (pread( unix_fd, &nt.OptionalHeader, toread, pos ) != toread) goto error; - pos += nt.FileHeader.SizeOfOptionalHeader; + } /* load the section headers */ + pos += sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader; size = sizeof(*sec) * nt.FileHeader.NumberOfSections; + if (pos + size > mapping->size) goto error; + if (pos + size > mapping->header_size) mapping->header_size = pos + size; if (!(sec = malloc( size ))) goto error; if (pread( unix_fd, sec, size, pos ) != size) goto error; @@ -340,14 +361,7 @@ static int get_image_params( struct mapping *mapping ) if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry ); - mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage ); - mapping->base = nt.OptionalHeader.ImageBase; - mapping->header_size = max( pos + size, nt.OptionalHeader.SizeOfHeaders ); - mapping->protect = VPROT_IMAGE; - - /* sanity check */ - if (pos + size > mapping->size) goto error; - + mapping->protect = VPROT_IMAGE; free( sec ); release_object( fd ); return 1;

1 0

Juan Lang : iphlpapi: Set adapter name in GetAdaptersAddresses.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 0ddc6d52874c59d0c7c4794733735b54ea6f8561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ddc6d52874c59d0c7c479473… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 11 15:49:50 2009 -0700 iphlpapi: Set adapter name in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 16cf1b3..4415cf6 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -642,12 +642,14 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; + total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_addrs; total_size += sizeof(struct sockaddr_in) * num_addrs; if (aa && *size >= total_size) { - char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES); + char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES), *src; + WCHAR *dst; DWORD buflen, type, status; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); @@ -658,6 +660,11 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL memcpy(ptr, name, IF_NAMESIZE); aa->AdapterName = ptr; ptr += IF_NAMESIZE; + aa->FriendlyName = (WCHAR *)ptr; + for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + *dst = *src; + *dst++ = 0; + ptr = (char *)dst; if (num_addrs) {

1 0