April 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Rename MSI_GetPropertyW and MSI_SetPropertyW.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: e31ee69f37ae3e8de820bec677e2c839a3ad6b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31ee69f37ae3e8de820bec67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 11:38:40 2010 +0200 msi: Rename MSI_GetPropertyW and MSI_SetPropertyW. For consistency with related functions msi_dup_property and msi_get_property_int and because there is no ANSI version of these functions. --- dlls/msi/action.c | 28 ++++++------ dlls/msi/appsearch.c | 4 +- dlls/msi/custom.c | 16 +++--- dlls/msi/dialog.c | 8 ++-- dlls/msi/events.c | 4 +- dlls/msi/helpers.c | 8 ++-- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 8 ++-- dlls/msi/msipriv.h | 4 +- dlls/msi/package.c | 128 +++++++++++++++++++++++++------------------------- dlls/msi/upgrade.c | 2 +- 11 files changed, 106 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e31ee69f37ae3e8de820b…

1 0

Joel Holdsworth : taskmgr: Show a 48x48 icon in the about box.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: b8f2302776d23c396202395f31cf4b3850d34be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f2302776d23c396202395f3… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:48 2010 +0100 taskmgr: Show a 48x48 icon in the about box. --- programs/taskmgr/about.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c index 68d64ca..c165f25 100644 --- a/programs/taskmgr/about.c +++ b/programs/taskmgr/about.c @@ -40,5 +40,5 @@ void OnAbout(void) '<','b','r','i','a','n','p','@','r','e','a','c','t','o','s','.','o','r','g','>',0}; LoadStringW( hInst, IDC_TASKMGR, appname, sizeof(appname)/sizeof(WCHAR) ); ShellAboutW( hMainWnd, appname, copy, - LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 32, 32, LR_SHARED )); + LoadImageA( hInst, (LPSTR)IDI_TASKMANAGER, IMAGE_ICON, 48, 48, LR_SHARED )); }

1 0

Joel Holdsworth : tools: Fixed buildicon to use the path of rsvg provided in the environment variable .
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 258a2128b9715ec699b0946265feb78bda24f322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258a2128b9715ec699b094626… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:52 2010 +0100 tools: Fixed buildicon to use the path of rsvg provided in the environment variable. --- tools/buildicon | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index 4c6a088..ec2ec69 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -123,7 +123,7 @@ sub fallback_render } # Render the SVG image -shell 'rsvg', $svgFileName, $renderedSVGFileName; +shell $rsvg, $svgFileName, $renderedSVGFileName; # Render the images in the SVG my $parser = new XML::Parser(

1 0

Joel Holdsworth : tools: Remove fallback render rule.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 60fad33ae9e7eaff4fb3733ff640a5706ada0c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fad33ae9e7eaff4fb3733ff… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:55 2010 +0100 tools: Remove fallback render rule. --- tools/buildicon | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index ec2ec69..f5d32c0 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -106,22 +106,6 @@ sub svg_element_start push(@pngFiles, $pngFileName); } -sub resize_image -{ - # Use ImageMagick to stretch the image - my($size) = @_; - my $pngFileName = "$icoName-$size.png"; - shell $convert, $renderedSVGFileName, "-resize", "${size}x${size}", $pngFileName; - push(@pngFiles, $pngFileName); -} - -sub fallback_render -{ - resize_image(16); - resize_image(32); - resize_image(48); -} - # Render the SVG image shell $rsvg, $svgFileName, $renderedSVGFileName; @@ -130,9 +114,8 @@ my $parser = new XML::Parser( Handlers => {Start => \&svg_element_start}); $parser->parsefile("$svgFileName"); -# If no render directives were found, this is an old-style icon -# which should be rendered with the old build rule -fallback_render unless(@pngFiles); +# Die if no render directives were found +die "No render directives found in icon" unless(@pngFiles); # Combine them into an ICO file shell $icotool, "-c", "-o", $icoFileName, @pngFiles;

1 0

Joel Holdsworth : tools: Fixed buildicon to support rectangular icons.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 310561acbbb6b1fd5b746f90f934482413fa595f URL: http://source.winehq.org/git/wine.git/?a=commit;h=310561acbbb6b1fd5b746f90f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:50:58 2010 +0100 tools: Fixed buildicon to support rectangular icons. --- tools/buildicon | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/buildicon b/tools/buildicon index f5d32c0..eae13dc 100755 --- a/tools/buildicon +++ b/tools/buildicon @@ -79,10 +79,12 @@ sub svg_element_start # Extract SVG vector images my $x = $attr{'x'}; my $y = $attr{'y'}; + my $width = $attr{'width'}; + my $height = $attr{'height'}; if(defined($x) and defined($x)) { if($x =~ /\d*/ and $y =~ /\d*/) { - shell $convert, $renderedSVGFileName, "-crop", "${size}x${size}+$x+$y", $pngFileName; + shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", $pngFileName; } }

1 0

Joel Holdsworth : comdlg32: Replaced collate icons with Tango compliant icons.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 6d467bb4346767bf72c84b02d9eb25b81378fe08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d467bb4346767bf72c84b02d… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 20 23:51:02 2010 +0100 comdlg32: Replaced collate icons with Tango compliant icons. --- dlls/comdlg32/Makefile.in | 4 + dlls/comdlg32/pd32_collate.ico | Bin 1374 -> 12206 bytes dlls/comdlg32/pd32_collate.svg | 676 +++++++++++++++ dlls/comdlg32/pd32_nocollate.ico | Bin 1374 -> 12206 bytes dlls/comdlg32/pd32_nocollate.svg | 1689 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 2369 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d467bb4346767bf72c84…

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLEventObj IDispatch functions.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: ec3220339120cfcdd58855790fc6cd7f21e05916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3220339120cfcdd58855790… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 21 14:56:41 2010 +1000 mshtml: Implement IHTMLEventObj IDispatch functions. --- dlls/mshtml/htmlevent.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index eef006c..30eea28 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -283,16 +283,14 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) static HRESULT WINAPI HTMLEventObj_GetTypeInfoCount(IHTMLEventObj *iface, UINT *pctinfo) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLEventObj_GetTypeInfo(IHTMLEventObj *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLEventObj_GetIDsOfNames(IHTMLEventObj *iface, REFIID riid, @@ -300,9 +298,7 @@ static HRESULT WINAPI HTMLEventObj_GetIDsOfNames(IHTMLEventObj *iface, REFIID ri LCID lcid, DISPID *rgDispId) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMember, @@ -310,9 +306,8 @@ static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMem VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLElement **p)

1 0

Henri Verbeet : wined3d: Avoid some unnecessary invalidations of the the onscreen depth buffer.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 7b47dabd0951a3eeaca38d1997419a836b158b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b47dabd0951a3eeaca38d199… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:41 2010 +0200 wined3d: Avoid some unnecessary invalidations of the the onscreen depth buffer. This can happen for example when the application switches to a different depth/stencil for offscreen rendering and back again. --- dlls/wined3d/device.c | 41 ++++++++++++++++++++++++++++++++------- dlls/wined3d/drawprim.c | 4 +++ dlls/wined3d/swapchain.c | 5 ++++ dlls/wined3d/wined3d_private.h | 3 ++ 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00d94fa..52d82b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -563,6 +563,18 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c device->contexts = new_array; } +void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, + struct wined3d_context *context, IWineD3DSurfaceImpl *depth_stencil) +{ + if (device->onscreen_depth_stencil) + { + surface_load_ds_location(device->onscreen_depth_stencil, context, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location(device->onscreen_depth_stencil, SFLAG_DS_OFFSCREEN); + IWineD3DSurface_Release((IWineD3DSurface *)device->onscreen_depth_stencil); + } + device->onscreen_depth_stencil = depth_stencil; + IWineD3DSurface_AddRef((IWineD3DSurface *)device->onscreen_depth_stencil); +} /********************************************************** * IUnknown parts follows @@ -1853,6 +1865,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->shader_backend->shader_free_private(iface); /* Release the buffers (with sanity checks)*/ + if (This->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + This->onscreen_depth_stencil = NULL; + } + TRACE("Releasing the depth stencil buffer at %p\n", This->depth_stencil); if (This->depth_stencil && IWineD3DSurface_Release((IWineD3DSurface *)This->depth_stencil)) { @@ -4429,6 +4447,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_ZBUFFER) { DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + + if (location == SFLAG_DS_ONSCREEN && depth_stencil != This->onscreen_depth_stencil) + device_switch_onscreen_ds(This, context, depth_stencil); + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) surface_load_ds_location(depth_stencil, context, location); surface_modify_ds_location(depth_stencil, location); @@ -5915,14 +5937,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * || This->depth_stencil->Flags & SFLAG_DISCARD) { surface_modify_ds_location(This->depth_stencil, SFLAG_DS_DISCARDED); - } - else - { - struct wined3d_context *context = context_acquire(This, - (IWineD3DSurface *)This->render_targets[0], CTXUSAGE_RESOURCELOAD); - surface_load_ds_location(This->depth_stencil, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->depth_stencil, SFLAG_DS_OFFSCREEN); - context_release(context); + if (This->depth_stencil == This->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + This->onscreen_depth_stencil = NULL; + } } } @@ -6449,6 +6468,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } } + if (This->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + This->onscreen_depth_stencil = NULL; + } + /* Reset the depth stencil */ if (pPresentationParameters->EnableAutoDepthStencil) IWineD3DDevice_SetDepthStencilSurface(iface, (IWineD3DSurface *)This->auto_depth_stencil); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fd19930..4579a54 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -612,7 +612,11 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE] || This->stateBlock->renderState[WINED3DRS_ZENABLE]) + { + if (location == SFLAG_DS_ONSCREEN && This->depth_stencil != This->onscreen_depth_stencil) + device_switch_onscreen_ds(This, context, This->depth_stencil); surface_load_ds_location(This->depth_stencil, context, location); + } if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) surface_modify_ds_location(This->depth_stencil, location); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 389efc2..02e6bf7 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -465,6 +465,11 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO || This->device->depth_stencil->Flags & SFLAG_DISCARD) { surface_modify_ds_location(This->device->depth_stencil, SFLAG_DS_DISCARDED); + if (This->device->depth_stencil == This->device->onscreen_depth_stencil) + { + IWineD3DSurface_Release((IWineD3DSurface *)This->device->onscreen_depth_stencil); + This->device->onscreen_depth_stencil = NULL; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97f5095..260e3c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1668,6 +1668,7 @@ struct IWineD3DDeviceImpl /* Render Target Support */ IWineD3DSurfaceImpl **render_targets; IWineD3DSurfaceImpl *auto_depth_stencil; + IWineD3DSurfaceImpl *onscreen_depth_stencil; IWineD3DSurfaceImpl *depth_stencil; /* palettes texture management */ @@ -1737,6 +1738,8 @@ void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) D void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; +void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context, + IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_get_gl_buffer().
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 79a014a5056b12a5f325b93cc618e41b0ef7f23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a014a5056b12a5f325b93cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:42 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_get_gl_buffer(). --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/surface.c | 25 ++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 716ec55..7aae16d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1874,11 +1874,11 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit) { const struct wined3d_gl_info *gl_info = context->gl_info; - IWineD3DSurface *rt = context->current_rt; + IWineD3DSurfaceImpl *rt = (IWineD3DSurfaceImpl *)context->current_rt; IWineD3DDeviceImpl *device; - device = ((IWineD3DSurfaceImpl *)rt)->resource.device; - if (!surface_is_offscreen((IWineD3DSurfaceImpl *)rt)) + device = rt->resource.device; + if (!surface_is_offscreen(rt)) { ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(rt)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 52d82b2..ff4a9b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4403,7 +4403,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurface *)target)); + context_set_draw_buffer(context, surface_get_gl_buffer(target)); LEAVE_GL(); } else @@ -5465,7 +5465,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context = context_acquire(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(surface)); + context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurfaceImpl *)surface)); } else { @@ -5773,7 +5773,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const if (!surface_is_offscreen((IWineD3DSurfaceImpl *)src_surface)) { - GLenum buffer = surface_get_gl_buffer(src_surface); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurfaceImpl *)src_surface); TRACE("Source surface %p is onscreen\n", src_surface); @@ -5809,7 +5809,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const /* Attach dst surface to dst fbo */ if (!surface_is_offscreen((IWineD3DSurfaceImpl *)dst_surface)) { - GLenum buffer = surface_get_gl_buffer(dst_surface); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurfaceImpl *)dst_surface); TRACE("Destination surface %p is onscreen\n", dst_surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91baf9c..46261fc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -925,20 +925,19 @@ void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned checkGLcall("set_compatible_renderbuffer"); } -GLenum surface_get_gl_buffer(IWineD3DSurface *iface) +GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->container; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)surface->container; - TRACE("iface %p.\n", iface); + TRACE("surface %p.\n", surface); - if (!(This->Flags & SFLAG_SWAPCHAIN)) + if (!(surface->Flags & SFLAG_SWAPCHAIN)) { - ERR("Surface %p is not on a swapchain.\n", iface); + ERR("Surface %p is not on a swapchain.\n", surface); return GL_NONE; } - if (swapchain->backBuffer && swapchain->backBuffer[0] == iface) + if (swapchain->backBuffer && (IWineD3DSurfaceImpl *)swapchain->backBuffer[0] == surface) { if (swapchain->render_to_fbo) { @@ -948,7 +947,7 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface) TRACE("Returning GL_BACK\n"); return GL_BACK; } - else if (swapchain->frontBuffer == iface) + else if ((IWineD3DSurfaceImpl *)swapchain->frontBuffer == surface) { TRACE("Returning GL_FRONT\n"); return GL_FRONT; @@ -1294,7 +1293,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, const RECT *rect, v else { /* Onscreen surfaces are always part of a swapchain */ - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); + GLenum buffer = surface_get_gl_buffer(This); TRACE("Locking %#x buffer\n", buffer); glReadBuffer(buffer); checkGLcall("glReadBuffer"); @@ -1516,7 +1515,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) */ if (!surface_is_offscreen(This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); + GLenum buffer = surface_get_gl_buffer(This); TRACE("Locking %#x buffer\n", buffer); ENTER_GL(); @@ -1775,7 +1774,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm if (!surface_is_offscreen(This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This); + GLenum buffer = surface_get_gl_buffer(This); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); } @@ -2999,7 +2998,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } else { - glReadBuffer(surface_get_gl_buffer(SrcSurface)); + glReadBuffer(surface_get_gl_buffer(Src)); } checkGLcall("glReadBuffer"); @@ -3154,7 +3153,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } else { - glReadBuffer(surface_get_gl_buffer(SrcSurface)); + glReadBuffer(surface_get_gl_buffer(Src)); } /* TODO: Only back up the part that will be overwritten */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 260e3c7..0dfe082 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2679,7 +2679,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; +GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass implementation pointers to stretch_rect_fbo().
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 660ad06692033b2ef1f60fe86d8e029cbdfb0869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=660ad06692033b2ef1f60fe86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:43 2010 +0200 wined3d: Simply pass implementation pointers to stretch_rect_fbo(). --- dlls/wined3d/device.c | 46 +++++++++++++++++++-------------------- dlls/wined3d/surface.c | 12 +++++----- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 30 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=660ad06692033b2ef1f60…

1 0