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
January 2011
----- 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
2 participants
879 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_autogen_filter_type ().
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 568f9ecb22414c236670953b66ab666961b281d8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=568f9ecb22414c236670953b6…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:37 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_autogen_filter_type(). --- dlls/wined3d/basetexture.c | 88 ++++++++++++++++++++------------------- dlls/wined3d/cubetexture.c | 6 ++- dlls/wined3d/texture.c | 6 ++- dlls/wined3d/volumetexture.c | 6 ++- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 58 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 15a58fd..d1c27e8 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -170,50 +170,52 @@ DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) return texture->baseTexture.level_count; } -HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) +HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WINED3DTEXTUREFILTERTYPE filter_type) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; - GLenum textureDimensions = This->baseTexture.target; - - if (!(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { - TRACE("(%p) : returning invalid call\n", This); - return WINED3DERR_INVALIDCALL; - } - if(This->baseTexture.filterType != FilterType) { - /* What about multithreading? Do we want all the context overhead just to set this value? - * Or should we delay the applying until the texture is used for drawing? For now, apply - * immediately. - */ - struct wined3d_context *context = context_acquire(device, NULL); - - ENTER_GL(); - glBindTexture(textureDimensions, This->baseTexture.texture_rgb.name); - checkGLcall("glBindTexture"); - switch(FilterType) { - case WINED3DTEXF_NONE: - case WINED3DTEXF_POINT: - glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); - checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); - - break; - case WINED3DTEXF_LINEAR: - glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); - checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); - - break; - default: - WARN("Unexpected filter type %d, setting to GL_NICEST\n", FilterType); - glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); - checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); - } - LEAVE_GL(); - - context_release(context); - } - This->baseTexture.filterType = FilterType; - TRACE("(%p) :\n", This); - return WINED3D_OK; + TRACE("texture %p, filter_type %s.\n", texture, debug_d3dtexturefiltertype(filter_type)); + + if (!(texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) + { + WARN("Texture doesn't have AUTOGENMIPMAP usage.\n"); + return WINED3DERR_INVALIDCALL; + } + + if (texture->baseTexture.filterType != filter_type) + { + GLenum target = texture->baseTexture.target; + struct wined3d_context *context; + + context = context_acquire(texture->resource.device, NULL); + + ENTER_GL(); + glBindTexture(target, texture->baseTexture.texture_rgb.name); + checkGLcall("glBindTexture"); + switch (filter_type) + { + case WINED3DTEXF_NONE: + case WINED3DTEXF_POINT: + glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); + break; + + case WINED3DTEXF_LINEAR: + glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); + break; + + default: + WARN("Unexpected filter type %#x, setting to GL_NICEST.\n", filter_type); + glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); + break; + } + LEAVE_GL(); + + context_release(context); + } + texture->baseTexture.filterType = filter_type; + + return WINED3D_OK; } WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ffd0da6..8dc2579 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -259,8 +259,10 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *i return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { - return basetexture_set_autogen_filter_type((IWineD3DBaseTexture *)iface, FilterType); +static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeTexture *iface, + WINED3DTEXTUREFILTERTYPE FilterType) +{ + return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6acd737..63cf182 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -250,8 +250,10 @@ static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } -static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { - return basetexture_set_autogen_filter_type((IWineD3DBaseTexture *)iface, FilterType); +static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *iface, + WINED3DTEXTUREFILTERTYPE FilterType) +{ + return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7606e99..a69049d 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -214,8 +214,10 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTextur return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVolumeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { - return basetexture_set_autogen_filter_type((IWineD3DBaseTexture *)iface, FilterType); +static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVolumeTexture *iface, + WINED3DTEXTUREFILTERTYPE FilterType) +{ + return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af542d4..d8647e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1924,7 +1924,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, +HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN;
1
0
0
0
Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_lod().
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 54e1aeeb62bab0e10b4f4f2f852bb6306d77a513 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=54e1aeeb62bab0e10b4f4f2f8…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:36 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_lod(). --- dlls/wined3d/basetexture.c | 8 +++----- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d1d7f10..15a58fd 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -157,13 +157,11 @@ DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) return old; } -DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) +DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - - TRACE("(%p) : returning %d\n", This, This->baseTexture.LOD); + TRACE("texture %p, returning %u.\n", texture, texture->baseTexture.LOD); - return This->baseTexture.LOD; + return texture->baseTexture.LOD; } DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index f82b02e..ffd0da6 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -251,7 +251,7 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_SetLOD(IWineD3DCubeTexture *iface, D } static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) { - return basetexture_get_lod((IWineD3DBaseTexture *)iface); + return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2bda3d6..6acd737 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -242,7 +242,7 @@ static DWORD WINAPI IWineD3DTextureImpl_SetLOD(IWineD3DTexture *iface, DWORD LOD } static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) { - return basetexture_get_lod((IWineD3DBaseTexture *)iface); + return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface); } static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7ec81f1..7606e99 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -206,7 +206,7 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DVolumeTexture *ifac } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *iface) { - return basetexture_get_lod((IWineD3DBaseTexture *)iface); + return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49c1f6f..af542d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1917,7 +1917,7 @@ void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; -DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UINT level_count,
1
0
0
0
Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_lod().
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 482a5fd030846c5d90b97db75f167d1a4277f448 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=482a5fd030846c5d90b97db75…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:35 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_lod(). --- dlls/wined3d/basetexture.c | 35 +++++++++++++++++------------------ dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index cd1b687..d1d7f10 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -127,34 +127,33 @@ void basetexture_unload(IWineD3DBaseTextureImpl *texture) resource_unload((IWineD3DResourceImpl *)texture); } -DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) +DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - DWORD old = This->baseTexture.LOD; + DWORD old = texture->baseTexture.LOD; + + TRACE("texture %p, lod %u.\n", texture, lod); /* The d3d9:texture test shows that SetLOD is ignored on non-managed - * textures. The call always returns 0, and GetLOD always returns 0 - */ - if (This->resource.pool != WINED3DPOOL_MANAGED) { - TRACE("Ignoring SetLOD on %s texture, returning 0\n", debug_d3dpool(This->resource.pool)); + * textures. The call always returns 0, and GetLOD always returns 0. */ + if (texture->resource.pool != WINED3DPOOL_MANAGED) + { + TRACE("Ignoring SetLOD on %s texture, returning 0.\n", debug_d3dpool(texture->resource.pool)); return 0; } - if (LODNew >= This->baseTexture.level_count) - LODNew = This->baseTexture.level_count - 1; + if (lod >= texture->baseTexture.level_count) + lod = texture->baseTexture.level_count - 1; - if(This->baseTexture.LOD != LODNew) { - This->baseTexture.LOD = LODNew; + if (texture->baseTexture.LOD != lod) + { + texture->baseTexture.LOD = lod; - This->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - This->baseTexture.texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - if(This->baseTexture.bindCount) { - IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(This->baseTexture.sampler)); - } + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; + texture->baseTexture.texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; + if (texture->baseTexture.bindCount) + IWineD3DDeviceImpl_MarkStateDirty(texture->resource.device, STATE_SAMPLER(texture->baseTexture.sampler)); } - TRACE("(%p) : set LOD to %d\n", This, This->baseTexture.LOD); - return old; } diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index da39701..f82b02e 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -247,7 +247,7 @@ static void * WINAPI IWineD3DCubeTextureImpl_GetParent(IWineD3DCubeTexture *ifac IWineD3DCubeTexture IWineD3DBaseTexture parts follow ****************************************************** */ static DWORD WINAPI IWineD3DCubeTextureImpl_SetLOD(IWineD3DCubeTexture *iface, DWORD LODNew) { - return basetexture_set_lod((IWineD3DBaseTexture *)iface, LODNew); + return basetexture_set_lod((IWineD3DBaseTextureImpl *)iface, LODNew); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3a757f..2bda3d6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -238,7 +238,7 @@ static void * WINAPI IWineD3DTextureImpl_GetParent(IWineD3DTexture *iface) IWineD3DTexture IWineD3DBaseTexture parts follow ****************************************************** */ static DWORD WINAPI IWineD3DTextureImpl_SetLOD(IWineD3DTexture *iface, DWORD LODNew) { - return basetexture_set_lod((IWineD3DBaseTexture *)iface, LODNew); + return basetexture_set_lod((IWineD3DBaseTextureImpl *)iface, LODNew); } static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index b2a6102..7ec81f1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -202,7 +202,7 @@ static void * WINAPI IWineD3DVolumeTextureImpl_GetParent(IWineD3DVolumeTexture * IWineD3DVolumeTexture IWineD3DBaseTexture parts follow ****************************************************** */ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DVolumeTexture *iface, DWORD LODNew) { - return basetexture_set_lod((IWineD3DBaseTexture *)iface, LODNew); + return basetexture_set_lod((IWineD3DBaseTextureImpl *)iface, LODNew); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e73776e..49c1f6f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,7 +1927,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; -DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod) DECLSPEC_HIDDEN; +DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; /*****************************************************************************
1
0
0
0
Greg Geldorp : winmm/tests: Don't use same buffer for both input and output .
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: fa973b812dc245e80f4b9ad5e6c066cb2ce69000 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fa973b812dc245e80f4b9ad5e…
Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 10:55:27 2011 +0100 winmm/tests: Don't use same buffer for both input and output. --- dlls/winmm/tests/mmio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0326a1a..e175083 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -65,7 +65,7 @@ static void test_mmioDescend(char *fname) MMRESULT ret; HMMIO hmmio; MMIOINFO mmio; - MMCKINFO ckRiff, ckList, ck; + MMCKINFO ckRiff, ckList, ck, ckList2; memset(&mmio, 0, sizeof(mmio)); mmio.fccIOProc = fname ? FOURCC_DOS : FOURCC_MEM; @@ -118,17 +118,17 @@ static void test_mmioDescend(char *fname) ret = mmioSeek(hmmio, ck.cksize, SEEK_CUR); ok(ret == 0x58, "expected 0x58, got %#x\n", ret); - ret = mmioDescend(hmmio, &ckList, &ckList, 0); + ret = mmioDescend(hmmio, &ckList2, &ckList, 0); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); - ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList.ckid); - ok(ckList.fccType == listtypeSTREAMHEADER, "wrong fccType: %04x\n", ckList.fccType); + ok(ckList2.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList2.ckid); + ok(ckList2.fccType == listtypeSTREAMHEADER, "wrong fccType: %04x\n", ckList2.fccType); trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n", - (LPCSTR)&ckList.ckid, ckList.cksize, (LPCSTR)&ckList.fccType, - ckList.dwDataOffset, ckList.dwFlags); + (LPCSTR)&ckList2.ckid, ckList2.cksize, (LPCSTR)&ckList2.fccType, + ckList2.dwDataOffset, ckList2.dwFlags); expect_buf_offset(hmmio, 100); - ret = mmioDescend(hmmio, &ck, &ckList, 0); + ret = mmioDescend(hmmio, &ck, &ckList2, 0); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); ok(ck.ckid == ckidSTREAMHEADER, "wrong ckid: %04x\n", ck.ckid); ok(ck.fccType == 0, "wrong fccType: %04x\n", ck.fccType);
1
0
0
0
Greg Geldorp : user32/tests: Skip DefWindowProc tests on Vista+.
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 4856c299ba04250b8e6140763b7f69b02a4bf47d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4856c299ba04250b8e6140763…
Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 10:55:48 2011 +0100 user32/tests: Skip DefWindowProc tests on Vista+. --- dlls/user32/tests/class.c | 84 +++++++++++++++++++++++++------------------- 1 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 95f8aeb..ed288aa 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -617,6 +617,7 @@ static void test_builtinproc(void) static const WCHAR classW[] = {'d','e','f','t','e','s','t',0}; WCHAR unistring[] = {0x142, 0x40e, 0x3b4, 0}; /* a string that would be destroyed by a W->A->W conversion */ WNDPROC pDefWindowProcA, pDefWindowProcW; + WNDPROC pNtdllDefWindowProcA, pNtdllDefWindowProcW; WNDPROC oldproc; WNDCLASSEXA cls; /* the memory layout of WNDCLASSEXA and WNDCLASSEXW is the same */ WCHAR buf[128]; @@ -626,45 +627,56 @@ static void test_builtinproc(void) pDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); pDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); - - for (i = 0; i < 4; i++) + pNtdllDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtdllDefWindowProc_A"); + pNtdllDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtdllDefWindowProc_W"); + + /* On Vista+, the user32.dll export DefWindowProcA/W is forwarded to */ + /* ntdll.NtdllDefWindowProc_A/W. However, the wndproc returned by */ + /* GetClassLong/GetWindowLong points to an unexported user32 function */ + if (pDefWindowProcA == pNtdllDefWindowProcA && + pDefWindowProcW == pNtdllDefWindowProcW) + skip("user32.DefWindowProcX forwarded to ntdll.NtdllDefWindowProc_X\n"); + else { - ZeroMemory(&cls, sizeof(cls)); - cls.cbSize = sizeof(cls); - cls.hInstance = GetModuleHandle(NULL); - cls.hbrBackground = GetStockObject (WHITE_BRUSH); - if (i & 1) - cls.lpfnWndProc = pDefWindowProcA; - else - cls.lpfnWndProc = pDefWindowProcW; - - if (i & 2) - { - cls.lpszClassName = classA; - atom = RegisterClassExA(&cls); - } - else + for (i = 0; i < 4; i++) { - cls.lpszClassName = (LPCSTR)classW; - atom = RegisterClassExW((WNDCLASSEXW *)&cls); + ZeroMemory(&cls, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.hInstance = GetModuleHandle(NULL); + cls.hbrBackground = GetStockObject (WHITE_BRUSH); + if (i & 1) + cls.lpfnWndProc = pDefWindowProcA; + else + cls.lpfnWndProc = pDefWindowProcW; + + if (i & 2) + { + cls.lpszClassName = classA; + atom = RegisterClassExA(&cls); + } + else + { + cls.lpszClassName = (LPCSTR)classW; + atom = RegisterClassExW((WNDCLASSEXW *)&cls); + } + ok(atom != 0, "Couldn't register class, i=%d, %d\n", i, GetLastError()); + + hwnd = CreateWindowA(classA, NULL, 0, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), NULL); + ok(hwnd != NULL, "Couldn't create window i=%d\n", i); + + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); + + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); + + DestroyWindow(hwnd); + UnregisterClass((LPSTR)(DWORD_PTR)atom, GetModuleHandle(NULL)); } - ok(atom != 0, "Couldn't register class, i=%d, %d\n", i, GetLastError()); - - hwnd = CreateWindowA(classA, NULL, 0, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), NULL); - ok(hwnd != NULL, "Couldn't create window i=%d\n", i); - - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); - ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); - - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); - ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); - - DestroyWindow(hwnd); - UnregisterClass((LPSTR)(DWORD_PTR)atom, GetModuleHandle(NULL)); } /* built-in winproc - window A/W type automatically detected */
1
0
0
0
Greg Geldorp : ole32/tests: Fix crashes in usrmarshal.
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 9c9762d1aba7efe07cc61a9999d2afbc8a0025ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9c9762d1aba7efe07cc61a999…
Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 10:55:07 2011 +0100 ole32/tests: Fix crashes in usrmarshal. --- dlls/ole32/tests/usrmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index a40e66b..7fdbdb6 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -182,6 +182,7 @@ static void test_marshal_HGLOBAL(void) wirehglobal += sizeof(ULONG); ok(*(ULONG *)wirehglobal == 0, "buffer+4 should be HGLOBAL\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + hglobal2 = NULL; HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); ok(hglobal2 == hglobal, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); @@ -227,6 +228,7 @@ static void test_marshal_HGLOBAL(void) ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + hglobal2 = NULL; HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); ok(hglobal2 != NULL, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer);
1
0
0
0
Gerald Pfeifer : dbghelp: Also return a value in an error case in elf_map_file_read.
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 061b50eda5e727cd6716832a983d3c47700434e8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=061b50eda5e727cd6716832a9…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:32:05 2011 +0100 dbghelp: Also return a value in an error case in elf_map_file_read. --- dlls/dbghelp/elf_module.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ff8b9d2..a64fe9f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -261,7 +261,9 @@ static BOOL elf_map_file_read(struct image_file_map* fmap, struct elf_map_file_d return ReadProcessMemory(emfd->u.process.handle, (void*)((unsigned long)emfd->u.process.load_addr + (unsigned long)off), buf, len, &dw) && dw == len; - default: assert(0); + default: + assert(0); + return FALSE; } }
1
0
0
0
Gerald Pfeifer : cards: Fix description of cdtTerm.
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: a55962cf412dc7387a6045ee07be8716c3ca18af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a55962cf412dc7387a6045ee0…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:34:30 2011 +0100 cards: Fix description of cdtTerm. --- dlls/cards/cards.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index 6a5a95f..f8f2b18 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -267,7 +267,7 @@ BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame) /*********************************************************************** - * Frees resources reserved by cdtInitialize. + * Frees resources reserved by cdtInit. */ void WINAPI cdtTerm(void) {
1
0
0
0
Gerald Pfeifer : comctl32: Shed unused parameter from TOOLTIPS_NCCreate.
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: 38ce67a462d367d500f96232c79975b0488e807d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=38ce67a462d367d500f96232c…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:33:20 2011 +0100 comctl32: Shed unused parameter from TOOLTIPS_NCCreate. --- dlls/comctl32/tooltips.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 774387a..a2e58e0 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1937,7 +1937,7 @@ TOOLTIPS_MouseMessage (TOOLTIPS_INFO *infoPtr) static LRESULT -TOOLTIPS_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) +TOOLTIPS_NCCreate (HWND hwnd) { DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); @@ -2292,7 +2292,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_MouseMessage (infoPtr); case WM_NCCREATE: - return TOOLTIPS_NCCreate (hwnd, (LPCREATESTRUCTW)lParam); + return TOOLTIPS_NCCreate (hwnd); case WM_NCHITTEST: return TOOLTIPS_NCHitTest (infoPtr, wParam, lParam);
1
0
0
0
Gerald Pfeifer : comctl32: Remove the last, unused parameter from LISTVIEW_HScroll.
by Alexandre Julliard
03 Jan '11
03 Jan '11
Module: wine Branch: master Commit: b227f754359f15d4f2f0d17a194e7545933e07bd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b227f754359f15d4f2f0d17a1…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:32:36 2011 +0100 comctl32: Remove the last, unused parameter from LISTVIEW_HScroll. --- dlls/comctl32/listview.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8c8637f..9588fa9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -457,7 +457,7 @@ static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT); -static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT, HWND); +static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); @@ -6065,7 +6065,7 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart { INT diff = nHorzDiff / nScrollPosWidth; if (nHorzDiff % nScrollPosWidth) diff += nHorzAdjust; - LISTVIEW_HScroll(infoPtr, SB_INTERNAL, diff, 0); + LISTVIEW_HScroll(infoPtr, SB_INTERNAL, diff); } if (nScrollPosHeight) @@ -7837,7 +7837,7 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) break; } - if (dx != 0) LISTVIEW_HScroll(infoPtr, SB_INTERNAL, dx, 0); + if (dx != 0) LISTVIEW_HScroll(infoPtr, SB_INTERNAL, dx); if (dy != 0) LISTVIEW_VScroll(infoPtr, SB_INTERNAL, dy); return TRUE; @@ -9576,7 +9576,7 @@ static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, * */ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, - INT nScrollDiff, HWND hScrollWnd) + INT nScrollDiff) { INT nOldScrollPos, nNewScrollPos; SCROLLINFO scrollInfo; @@ -9690,7 +9690,7 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) break; case LV_VIEW_LIST: - LISTVIEW_HScroll(infoPtr, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0, 0); + LISTVIEW_HScroll(infoPtr, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0); break; } return 0; @@ -11431,7 +11431,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return (LRESULT)infoPtr->hFont; case WM_HSCROLL: - return LISTVIEW_HScroll(infoPtr, (INT)LOWORD(wParam), 0, (HWND)lParam); + return LISTVIEW_HScroll(infoPtr, (INT)LOWORD(wParam), 0); case WM_KEYDOWN: return LISTVIEW_KeyDown(infoPtr, (INT)wParam, (LONG)lParam);
1
0
0
0
← Newer
1
...
84
85
86
87
88
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
Results per page:
10
25
50
100
200