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
July
June
May
April
March
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
April 2010
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
898 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Simply pass IWineD3DSurfaceImpl pointers to IWineD3DSurfaceImpl_BltOverride ().
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 553f429964baad21fa7e863564b29a06d15c1ff1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=553f429964baad21fa7e86356…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:35 2010 +0200 wined3d: Simply pass IWineD3DSurfaceImpl pointers to IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 191 +++++++++++++++++++++++++++--------------------- 1 files changed, 107 insertions(+), 84 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=553f429964baad21fa7e8…
1
0
0
0
Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_internal_preload().
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: d1ea48b971e52a50e6c987cf5cc8ad668934abe4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d1ea48b971e52a50e6c987cf5…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:34 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_internal_preload(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 48 ++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec8a02a..0bd613c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6906,7 +6906,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ RECT dst_rect = *dst_rect_in; /* Now load the surface */ - surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + surface_internal_preload(src_surface, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface, CTXUSAGE_BLIT); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 26c2981..ad969b8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2003,7 +2003,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI if (context->render_offscreen) { FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); @@ -2149,11 +2149,11 @@ static void context_setup_target(IWineD3DDeviceImpl *device, /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) { - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_BOTH); + surface_internal_preload(context->current_rt, SRGB_BOTH); } else { - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); } IWineD3DSurface_ModifyLocation((IWineD3DSurface *)context->current_rt, SFLAG_INDRAWABLE, FALSE); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0fe67a4..894ef2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5247,7 +5247,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, LEAVE_GL(); /* Make sure the surface is loaded and up to date */ - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_impl, SRGB_RGB); IWineD3DSurface_BindTexture(dst_surface, FALSE); src_w = src_impl->currentDesc.Width; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2180256..ddb0ac7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1071,46 +1071,49 @@ static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) IWineD3DSurface IWineD3DResource parts follow **************************************************** */ -void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) { /* TODO: check for locks */ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DDeviceImpl *device = surface->resource.device; IWineD3DBaseTexture *baseTexture = NULL; - TRACE("(%p)Checking to see if the container is a base texture\n", This); - if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) baseTexture; + TRACE("(%p)Checking to see if the container is a base texture\n", surface); + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&baseTexture))) + { + IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *)baseTexture; TRACE("Passing to container\n"); tex_impl->baseTexture.internal_preload(baseTexture, srgb); IWineD3DBaseTexture_Release(baseTexture); } else { struct wined3d_context *context = NULL; - TRACE("(%p) : About to load surface\n", This); + TRACE("(%p) : About to load surface\n", surface); if (!device->isInDraw) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) + if (surface->resource.format_desc->format == WINED3DFMT_P8_UINT + || surface->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - if(palette9_changed(This)) { + if (palette9_changed(surface)) + { TRACE("Reloading surface because the d3d8/9 palette was changed\n"); /* TODO: This is not necessarily needed with hw palettized texture support */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, NULL); /* Make sure the texture is reloaded because of the palette change, this kills performance though :( */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INTEXTURE, FALSE); } } - IWineD3DSurface_LoadTexture(iface, srgb == SRGB_SRGB ? TRUE : FALSE); + IWineD3DSurface_LoadTexture((IWineD3DSurface *)surface, srgb == SRGB_SRGB ? TRUE : FALSE); - if (This->resource.pool == WINED3DPOOL_DEFAULT) { + if (surface->resource.pool == WINED3DPOOL_DEFAULT) + { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; tmp = 0.9f; ENTER_GL(); - glPrioritizeTextures(1, &This->texture_name, &tmp); + glPrioritizeTextures(1, &surface->texture_name, &tmp); LEAVE_GL(); } @@ -1118,8 +1121,9 @@ void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) } } -static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { - surface_internal_preload(iface, SRGB_ANY); +static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) +{ + surface_internal_preload((IWineD3DSurfaceImpl *)iface, SRGB_ANY); } /* Context activation is done by the caller. */ @@ -2707,7 +2711,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, c LEAVE_GL(); } else { /* bind the real texture, and make sure it up to date */ - surface_internal_preload(iface, SRGB_RGB); + surface_internal_preload(This, SRGB_RGB); surface_bind_and_dirtify(This, FALSE); } allocatedMemory = HeapAlloc(GetProcessHeap(), 0, width * height * 4); @@ -3009,7 +3013,7 @@ static void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *dst_surface, IWineD3D } context = context_acquire(device, src_surface, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, SRGB_RGB); ENTER_GL(); /* Bind the target texture */ @@ -3117,14 +3121,14 @@ static void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *dst_surface, IWine TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(device, src_surface, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->texture_name) { /* Get it a description */ - surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + surface_internal_preload(src_surface, SRGB_RGB); } ENTER_GL(); @@ -3657,7 +3661,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } /* Now load the surface */ - surface_internal_preload((IWineD3DSurface *) Src, SRGB_RGB); + surface_internal_preload(Src, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, This, CTXUSAGE_BLIT); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 556ceeb..ecdd836 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1872,7 +1872,7 @@ typedef struct IWineD3DBaseTextureClass void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass; -void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; void surface_prepare_texture(IWineD3DSurfaceImpl *surface,
1
0
0
0
Henri Verbeet : wined3d: Add a missing newline to a TRACE in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: c56d3c199c803550d1014fb2a2c5b4a3b9ff1254 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c56d3c199c803550d1014fb2a…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:33 2010 +0200 wined3d: Add a missing newline to a TRACE in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2b20c4..0fe67a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5208,7 +5208,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, DWORD sampler; struct wined3d_format_desc dummy_desc; - TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s", + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s.\n", iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_point(dst_point));
1
0
0
0
Henri Verbeet : wined3d: Kill the now unused MAX_MIP_LEVELS.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 61d8338815516d2161f6806a4f519d34bbe33abd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=61d8338815516d2161f6806a4…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:32 2010 +0200 wined3d: Kill the now unused MAX_MIP_LEVELS. --- dlls/wined3d/wined3d_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 52486f5..556ceeb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -773,9 +773,6 @@ extern int num_lock DECLSPEC_HIDDEN; (vec)[3] = D3DCOLOR_A(dw); \ } while(0) -/* DirectX Device Limits */ -/* --------------------- */ -#define MAX_MIP_LEVELS 32 /* Maximum number of mipmap levels. */ #define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ /* Checking of API calls */
1
0
0
0
Gerald Pfeifer : quartz: Remove variable keyframe which is not really used from AVISplitter_next_request .
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 0dac2e89111cd7628ca1bb8fc7fb269ca99aef88 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0dac2e89111cd7628ca1bb8fc…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 15:52:15 2010 +0200 quartz: Remove variable keyframe which is not really used from AVISplitter_next_request. --- dlls/quartz/avisplit.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 42ec2ae..d1d3426 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -178,7 +178,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe { AVISTDINDEX *index = stream->stdindex[stream->index]; AVISTDINDEX_ENTRY *entry = &index->aIndex[stream->pos]; - BOOL keyframe; /* End of file */ if (stream->index >= stream->entries) @@ -189,7 +188,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe } rtSampleStart = index->qwBaseOffset; - keyframe = !(entry->dwSize >> 31); rtSampleStart += entry->dwOffset; rtSampleStart = MEDIATIME_FROM_BYTES(rtSampleStart);
1
0
0
0
Gerald Pfeifer : ole32: Remove variable res which is not really used from CompositeMonikerImpl_Reduce .
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 1e3aba6e7c3207ac5e9d73ddddbde25f5d3d2994 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1e3aba6e7c3207ac5e9d73ddd…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 14:11:58 2010 +0200 ole32: Remove variable res which is not really used from CompositeMonikerImpl_Reduce. --- dlls/ole32/compositemoniker.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 7402b8e..275d875 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -445,7 +445,6 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - HRESULT res; IMoniker *tempMk,*antiMk,*mostRigthMk,*leftReducedComposedMk,*mostRigthReducedMk; IEnumMoniker *enumMoniker; @@ -462,8 +461,8 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + CreateAntiMoniker(&antiMk); + IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); return IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); @@ -479,8 +478,8 @@ CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL); IEnumMoniker_Release(enumMoniker); - res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + CreateAntiMoniker(&antiMk); + IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); /* If any of the components reduces itself, the method returns S_OK and passes back a composite */
1
0
0
0
Alexandre Julliard : ntdll: Make TAPE_GetStatus inline to avoid a unused function warning.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 2e823590d4431dfcbea95d46c62193a2c6a21031 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2e823590d4431dfcbea95d46c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 07:18:46 2010 -0500 ntdll: Make TAPE_GetStatus inline to avoid a unused function warning. --- dlls/ntdll/tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index b8a4ab2..2667e18 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -88,7 +88,7 @@ static const char *io2str( DWORD io ) /****************************************************************** * TAPE_GetStatus */ -static NTSTATUS TAPE_GetStatus( int error ) +static inline NTSTATUS TAPE_GetStatus( int error ) { if (!error) return STATUS_SUCCESS; return FILE_GetNtStatus();
1
0
0
0
Alexandre Julliard : wined3d: Avoid a compiler warning on old gcc.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: fdfabd53f166be67c0ae947fd5dadaf59b939642 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fdfabd53f166be67c0ae947fd…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 07:18:18 2010 -0500 wined3d: Avoid a compiler warning on old gcc. --- 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 db7ccd2..7648d15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -255,7 +255,7 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA /* GL locking is done by the caller. */ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_info, GLhandleARB program) { - GLint i, object_count, source_size; + GLint i, object_count, source_size = -1; GLhandleARB *objects; char *source = NULL; @@ -275,7 +275,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetObjectParameterivARB(objects[i], GL_OBJECT_SHADER_SOURCE_LENGTH_ARB, &tmp)); - if (!source || source_size < tmp) + if (source_size < tmp) { HeapFree(GetProcessHeap(), 0, source);
1
0
0
0
Frédéric Delanoy : tools: Fix formatting errors in winemaker manpage.
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: f99fc3831317be1ed981a5f0a670c0ee4ddaca4a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f99fc3831317be1ed981a5f0a…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 25 01:55:43 2010 +0200 tools: Fix formatting errors in winemaker manpage. --- tools/winemaker.de.man.in | 72 ++++++++++++++++++++++---------------------- tools/winemaker.man.in | 72 ++++++++++++++++++++++---------------------- 2 files changed, 72 insertions(+), 72 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f99fc3831317be1ed981a…
1
0
0
0
Gerald Pfeifer : winecfg: Remove variable cUnixPathLen which is not really used from apply_shell_folder_changes .
by Alexandre Julliard
26 Apr '10
26 Apr '10
Module: wine Branch: master Commit: 814f570e5b9aeb3051c40bf276f122d6af02f02c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=814f570e5b9aeb3051c40bf27…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:07:37 2010 +0200 winecfg: Remove variable cUnixPathLen which is not really used from apply_shell_folder_changes. --- programs/winecfg/theme.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 96110b3..56b3585 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -903,7 +903,7 @@ static void on_shell_folder_edit_changed(HWND hDlg) { static void apply_shell_folder_changes(void) { WCHAR wszPath[MAX_PATH]; char szBackupPath[FILENAME_MAX], szUnixPath[FILENAME_MAX], *pszUnixPath = NULL; - int i, cUnixPathLen; + int i; struct stat statPath; HRESULT hr; @@ -923,7 +923,6 @@ static void apply_shell_folder_changes(void) { HeapFree(GetProcessHeap(), 0, pszUnixPath); /* Derive name for folder backup. */ - cUnixPathLen = lstrlenA(szUnixPath); lstrcpyA(szBackupPath, szUnixPath); lstrcatA(szBackupPath, ".winecfg");
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
90
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
Results per page:
10
25
50
100
200