winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
5 participants
1115 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Only use stretch_rect_fbo() on surfaces that are FBO attachable.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: fb7531599f76f7af7be11798bf12f83f61428d43 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fb7531599f76f7af7be11798b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 14:39:20 2009 +0200 wined3d: Only use stretch_rect_fbo() on surfaces that are FBO attachable. --- dlls/wined3d/surface.c | 21 ++++++++++++++++++--- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d65105d..2f5554f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -523,6 +523,17 @@ void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) } } +static inline BOOL surface_can_stretch_rect(IWineD3DSurfaceImpl *src, IWineD3DSurfaceImpl *dst) +{ + return ((src->resource.format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) + || (src->resource.usage & WINED3DUSAGE_RENDERTARGET)) + && ((dst->resource.format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) + || (dst->resource.usage & WINED3DUSAGE_RENDERTARGET)) + && (src->resource.format_desc->format == dst->resource.format_desc->format + || (is_identity_fixup(src->resource.format_desc->color_fixup) + && is_identity_fixup(dst->resource.format_desc->color_fixup))); +} + static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -3408,7 +3419,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT)) { + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) + && surface_can_stretch_rect(Src, This)) + { stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect, (IWineD3DSurface *)This, &rect, Filter, upsideDown); } else if((!stretchx) || rect.x2 - rect.x1 > Src->currentDesc.Width || @@ -3470,8 +3483,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const Src->palette = This->palette; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && - (Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) == 0) { + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) + && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) + && surface_can_stretch_rect(Src, This)) + { TRACE("Using stretch_rect_fbo\n"); /* The source is always a texture, but never the currently active render target, and the texture * contents are never upside down diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef55419..e95bd4c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -549,6 +549,7 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) { TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); + desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; desc->rtInternal = desc->glInternal; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a610b7a..adf6235 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2749,6 +2749,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth); #define WINED3DFMT_FLAG_STENCIL 0x8 #define WINED3DFMT_FLAG_RENDERTARGET 0x10 #define WINED3DFMT_FLAG_FOURCC 0x20 +#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x40 struct GlPixelFormatDesc {
1
0
0
0
Henri Verbeet : wined3d: Check FBO compatibility on all formats with a GL format.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: 786408fb954aa71065a3385b23d3d9ecca885b26 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=786408fb954aa71065a3385b2…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Check FBO compatibility on all formats with a GL format. Instead of just the ones that have a fallback specified. --- dlls/wined3d/utils.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d4eed06..ef55419 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -501,7 +501,7 @@ static BOOL init_format_base_info(WineD3D_GL_Info *gl_info) #define GLINFO_LOCATION (*gl_info) -static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format) +static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) { GLuint tex, fb; GLenum status; @@ -511,7 +511,7 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form while(glGetError()); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); - glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, format, type, NULL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -540,21 +540,34 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (!desc->glInternal) continue; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && desc->rtInternal) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* Check if the default internal format is supported as a frame buffer target, otherwise * fall back to the render target internal. * * Try to stick to the standard format if possible, this limits precision differences. */ - if (check_fbo_compat(gl_info, desc->glInternal)) + if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) { TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); desc->rtInternal = desc->glInternal; } else { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", - debug_d3dformat(desc->format)); + if (!desc->rtInternal) + { + if (desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) + { + FIXME("Internal format of %s not supported as FBO target, and no fallback specified.\n", + debug_d3dformat(desc->format)); + desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + desc->rtInternal = desc->glInternal; + } + else + { + TRACE("Internal format of %s not supported as FBO target, using render target internal instead.\n", + debug_d3dformat(desc->format)); + } } } else
1
0
0
0
Henri Verbeet : wined3d: Set texture filtering to NEAREST in check_fbo_compat().
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: b93c3b3253f3fcd3b770408c88f9bd57664c3ee6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b93c3b3253f3fcd3b770408c8…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Set texture filtering to NEAREST in check_fbo_compat(). --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 167ba71..d4eed06 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -512,6 +512,8 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); GL_EXTCALL(glGenFramebuffersEXT(1, &fb)); GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb));
1
0
0
0
Henri Verbeet : wined3d: Add extension detection to the GL format template table.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: 0571ebcee3d0fdb524d8609ea0ec4703cdfad71d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0571ebcee3d0fdb524d8609ea…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Add extension detection to the GL format template table. --- dlls/wined3d/utils.c | 244 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 163 insertions(+), 81 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0571ebcee3d0fdb524d86…
1
0
0
0
Henri Verbeet : wined3d: Add extension detection for ARB_depth_texture.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: a2440aed7ecce09f634c2ea1b9903180ae5756af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a2440aed7ecce09f634c2ea1b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Add extension detection for ARB_depth_texture. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5dab206..06d5476 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -63,6 +63,7 @@ static const struct { /* ARB */ {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT, 0 }, + {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE, 0 }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ad243e3..49d29a7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3384,6 +3384,7 @@ typedef enum _GL_SupportedExt { WINED3D_GL_EXT_NONE, /* ARB */ ARB_COLOR_BUFFER_FLOAT, + ARB_DEPTH_TEXTURE, ARB_DRAW_BUFFERS, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER,
1
0
0
0
Henri Verbeet : wined3d: Don't use the vertex/pixel shader when we' re not supposed to.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: daeb86d620f48b5eb8a12feb08864c6211be8b0c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=daeb86d620f48b5eb8a12feb0…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:46 2009 +0200 wined3d: Don't use the vertex/pixel shader when we're not supposed to. This also avoids removing programs from lists they're not in in delete_glsl_program_entry(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bd91bc9..6c0fd84 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3945,8 +3945,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct shader_glsl_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - IWineD3DPixelShader *pshader = This->stateBlock->pixelShader; - IWineD3DVertexShader *vshader = This->stateBlock->vertexShader; + IWineD3DPixelShader *pshader = use_ps ? This->stateBlock->pixelShader : NULL; + IWineD3DVertexShader *vshader = use_vs ? This->stateBlock->vertexShader : NULL; struct glsl_shader_prog_link *entry = NULL; GLhandleARB programId = 0; GLhandleARB reorder_shader_id = 0;
1
0
0
0
Henri Verbeet : wined3d: Check the result from wine_rb_get() before using it in WINE_RB_ENTRY_VALUE.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: cae6a32b0807bebd5a7dc317c4241de3496ad367 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cae6a32b0807bebd5a7dc317c…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:46 2009 +0200 wined3d: Check the result from wine_rb_get() before using it in WINE_RB_ENTRY_VALUE. --- dlls/wined3d/glsl_shader.c | 5 +++-- dlls/wined3d/utils.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89b1e03..bd91bc9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3277,6 +3277,7 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, IWineD3DVertexShader *vshader, IWineD3DPixelShader *pshader, struct vs_compile_args *vs_args, struct ps_compile_args *ps_args) { + struct wine_rb_entry *entry; glsl_program_key_t key; key.vshader = vshader; @@ -3284,8 +3285,8 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_p key.vs_args = *vs_args; key.ps_args = *ps_args; - return WINE_RB_ENTRY_VALUE(wine_rb_get(&priv->program_lookup, &key), - struct glsl_shader_prog_link, program_lookup_entry); + entry = wine_rb_get(&priv->program_lookup, &key); + return entry ? WINE_RB_ENTRY_VALUE(entry, struct glsl_shader_prog_link, program_lookup_entry) : NULL; } /* GL locking is done by the caller */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e4c09c8..596bccb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2103,7 +2103,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) { - return WINE_RB_ENTRY_VALUE(wine_rb_get(fragment_shaders, settings), struct ffp_frag_desc, entry); + struct wine_rb_entry *entry = wine_rb_get(fragment_shaders, settings); + return entry ? WINE_RB_ENTRY_VALUE(entry, struct ffp_frag_desc, entry) : NULL; } void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc)
1
0
0
0
Francois Gouget : ole32/tests: Make test_readonly() static.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: 70cdb5c3e4e45a1fda26ad32769d159ac795847d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=70cdb5c3e4e45a1fda26ad327…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 5 08:15:48 2009 +0200 ole32/tests: Make test_readonly() static. --- dlls/ole32/tests/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 29ff0c6..5fef82c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1222,7 +1222,7 @@ static void test_access(void) DeleteFileA("winetest"); } -void test_readonly(void) +static void test_readonly(void) { IStorage *stg, *stg2, *stg3; IStream *stream;
1
0
0
0
Francois Gouget : rpcrt4/tests: Make dummy_Release() static.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: 47be6e8379e848e4a16c65f65705b954a060dae0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=47be6e8379e848e4a16c65f65…
Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 5 08:15:44 2009 +0200 rpcrt4/tests: Make dummy_Release() static. --- dlls/rpcrt4/tests/cstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index e3edee7..1ce24ce 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -685,7 +685,7 @@ static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) return InterlockedIncrement( &this->ref ); } -ULONG WINAPI dummy_Release(LPUNKNOWN iface) +static ULONG WINAPI dummy_Release(LPUNKNOWN iface) { struct dummy_unknown *this = (struct dummy_unknown *)iface; return InterlockedDecrement( &this->ref );
1
0
0
0
Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard
05 Jun '09
05 Jun '09
Module: wine Branch: master Commit: 925cd00cd1904857a0548e1fee970bca462af66b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=925cd00cd1904857a0548e1fe…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 4 21:38:32 2009 +0100 comctl32: Constify some variables. --- dlls/comctl32/header.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 40718c7..fed582d 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1189,7 +1189,7 @@ HEADER_GetOrderArray(const HEADER_INFO *infoPtr, INT size, LPINT order) } static LRESULT -HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, LPINT order) +HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, const INT *order) { INT i; HEADER_ITEM *lpItem; @@ -1400,7 +1400,7 @@ HEADER_SetUnicodeFormat (HEADER_INFO *infoPtr, WPARAM wParam) static LRESULT -HEADER_Create (HWND hwnd, LPCREATESTRUCTW lpcs) +HEADER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { HEADER_INFO *infoPtr; TEXTMETRICW tm; @@ -1496,7 +1496,7 @@ HEADER_IsDragDistance(const HEADER_INFO *infoPtr, const POINT *pt) } static LRESULT -HEADER_LButtonDblClk (HEADER_INFO *infoPtr, INT x, INT y) +HEADER_LButtonDblClk (const HEADER_INFO *infoPtr, INT x, INT y) { POINT pt; UINT flags; @@ -1923,7 +1923,7 @@ static LRESULT HEADER_SetRedraw(HEADER_INFO *infoPtr, WPARAM wParam, LPARAM lPar } static INT HEADER_StyleChanged(HEADER_INFO *infoPtr, WPARAM wStyleType, - const LPSTYLESTRUCT lpss) + const STYLESTRUCT *lpss) { TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew);
1
0
0
0
← Newer
1
...
89
90
91
92
93
94
95
...
112
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
Results per page:
10
25
50
100
200