October 2011 - Wine-commits

Henri Verbeet : wined3d: Reject multisampled readbacks in wined3d_surface_get_render_target_data().
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 6e8273177a47cd98fc4d6b4b293260b79ef19b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8273177a47cd98fc4d6b4b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:23:58 2011 +0200 wined3d: Reject multisampled readbacks in wined3d_surface_get_render_target_data(). --- dlls/d3d9/device.c | 3 +-- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/surface.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0372239..4768ece 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -971,8 +971,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(IDirect3DDevice9E TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, pRenderTarget, pDestSurface); wined3d_mutex_lock(); - hr = wined3d_surface_bltfast(destSurface->wined3d_surface, 0, 0, - renderTarget->wined3d_surface, NULL, WINEDDBLTFAST_NOCOLORKEY); + hr = wined3d_surface_get_render_target_data(destSurface->wined3d_surface, renderTarget->wined3d_surface); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c583b12..2d651bf 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12644,7 +12644,7 @@ static void multisample_get_rtdata_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTargetData(device, rt, readback); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54b46b1..7b17e2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1826,6 +1826,19 @@ HRESULT CDECL wined3d_surface_bltfast(struct wined3d_surface *dst_surface, DWORD return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, NULL, WINED3DTEXF_POINT); } +HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *surface, + struct wined3d_surface *render_target) +{ + TRACE("surface %p, render_target %p.\n", surface, render_target); + + /* TODO: Check surface sizes, pools, etc. */ + + if (render_target->resource.multisample_type) + return WINED3DERR_INVALIDCALL; + + return wined3d_surface_blt(surface, NULL, render_target, NULL, 0, NULL, WINED3DTEXF_POINT); +} + /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6af4d3c..9cac395 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -212,6 +212,7 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_priority(ptr) +@ cdecl wined3d_surface_get_render_target_data(ptr ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_incref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e4ca4c4..a67949b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2428,6 +2428,8 @@ struct wined3d_palette * __cdecl wined3d_surface_get_palette(const struct wined3 void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface); +HRESULT __cdecl wined3d_surface_get_render_target_data(struct wined3d_surface *surface, + struct wined3d_surface *render_target); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);

1 0

Henri Verbeet : wined3d: Get rid of surface_gdi_cleanup().
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: e6101816a236e9ecd735abeda9f7c7c88773e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6101816a236e9ecd735abeda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:23:59 2011 +0200 wined3d: Get rid of surface_gdi_cleanup(). It's effectively the same as surface_cleanup(). The GL objects that surface_cleanup() destroys are never created for "GDI" surfaces. --- dlls/wined3d/surface.c | 39 ++------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b17e2f..7dfc5b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1962,7 +1962,6 @@ static const struct wined3d_resource_ops surface_resource_ops = static const struct wined3d_surface_ops surface_ops = { surface_private_setup, - surface_cleanup, surface_realize_palette, surface_draw_overlay, surface_preload, @@ -2015,39 +2014,6 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) return WINED3D_OK; } -static void surface_gdi_cleanup(struct wined3d_surface *surface) -{ - struct wined3d_surface *overlay, *cur; - - TRACE("surface %p.\n", surface); - - if (surface->flags & SFLAG_DIBSECTION) - { - /* Release the DC. */ - SelectObject(surface->hDC, surface->dib.holdbitmap); - DeleteDC(surface->hDC); - /* Release the DIB section. */ - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; - } - - if (surface->flags & SFLAG_USERPTR) - wined3d_surface_set_mem(surface, NULL); - if (surface->overlay_dest) - list_remove(&surface->overlay_entry); - - LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry) - { - list_remove(&overlay->overlay_entry); - overlay->overlay_dest = NULL; - } - - HeapFree(GetProcessHeap(), 0, surface->palette9); - - resource_cleanup(&surface->resource); -} - static void gdi_surface_realize_palette(struct wined3d_surface *surface) { struct wined3d_palette *palette = surface->palette; @@ -2155,7 +2121,6 @@ static HRESULT gdi_surface_getdc(struct wined3d_surface *surface) static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, - surface_gdi_cleanup, gdi_surface_realize_palette, gdi_surface_draw_overlay, gdi_surface_preload, @@ -2915,7 +2880,7 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) if (!refcount) { - surface->surface_ops->surface_cleanup(surface); + surface_cleanup(surface); surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); TRACE("Destroyed surface %p.\n", surface); @@ -7214,7 +7179,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE sur if (FAILED(hr)) { ERR("Private setup failed, returning %#x\n", hr); - surface->surface_ops->surface_cleanup(surface); + surface_cleanup(surface); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebe277b..e2fd75e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1990,7 +1990,6 @@ struct wined3d_subresource_container struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); - void (*surface_cleanup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); HRESULT (*surface_draw_overlay)(struct wined3d_surface *surface); void (*surface_preload)(struct wined3d_surface *surface);

1 0

Henri Verbeet : wined3d: Make the context parameter to bind_dummy_textures( ) const.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 96187a54a99257417fac4846dc0f1ef6c8641295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96187a54a99257417fac4846d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:24:00 2011 +0200 wined3d: Make the context parameter to bind_dummy_textures() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2c26728..2742b54 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1282,7 +1282,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* GL locking is done by the caller */ -static void bind_dummy_textures(const struct wined3d_device *device, struct wined3d_context *context) +static void bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers);

1 0

Frédéric Delanoy : French translation for release 1.3.31
by Jeremy Newman 24 Oct '11

24 Oct '11

Module: website Branch: master Commit: 2f3b198aab6cf51607c28897ee18108345ab30ee URL: http://source.winehq.org/git/website.git/?a=commit;h=2f3b198aab6cf51607c288… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 22:01:06 2011 +0200 French translation for release 1.3.31 --- news/fr/2011102101.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/fr/2011102101.xml b/news/fr/2011102101.xml new file mode 100644 index 0000000..9871acb --- /dev/null +++ b/news/fr/2011102101.xml @@ -0,0 +1,19 @@ +<news> +<date>21 octobre 2011</date> +<title>Sortie de Wine 1.3.31</title> +<body> + La version de développement 1.3.31 de Wine est disponible. + <a href="{$root}/announce/1.3.31">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de texte BiDi dans le contrôle d'édition monoligne.</li> + <li>Support de StretchDIBits et AlphaBlend dans le moteur DIB.</li> + <li>Quelques correctifs audio.</li> + <li>Améliorations VBScript.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.31
by Jeremy Newman 24 Oct '11

24 Oct '11

Module: website Branch: master Commit: 071faa130e5d47d09aa46fb10603dff8e505bccb URL: http://source.winehq.org/git/website.git/?a=commit;h=071faa130e5d47d09aa46f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 22 08:20:25 2011 +0200 Polish translation for release 1.3.31 --- news/pl/2011102101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2011102101.xml b/news/pl/2011102101.xml new file mode 100644 index 0000000..c7d4305 --- /dev/null +++ b/news/pl/2011102101.xml @@ -0,0 +1,16 @@ +<news> +<date>Październik 21, 2011</date> +<title>Wydano Wine 1.3.31</title> +<body> + Wydanie rozwojowe Wine 1.3.31 jest już dostępne. + <a href="{$root}/announce/1.3.31">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie tekstu BiDi w jednowierszowej kontrolce edycji.</li> + <li>Wsparcie dla StretchDIBits i AlphaBlend w silniku DIB.</li> + <li>Kilka poprawek do dźwięku.</li> + <li>Ulepszenia w VBScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.3.31 freigegeben
by Jeremy Newman 24 Oct '11

24 Oct '11

Module: website Branch: master Commit: c8233db95169feb50210f8d3e0fdb3fccef76c28 URL: http://source.winehq.org/git/website.git/?a=commit;h=c8233db95169feb50210f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 23 18:09:04 2011 +0200 Wine 1.3.31 freigegeben --- news/de/2011102101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2011102101.xml b/news/de/2011102101.xml new file mode 100644 index 0000000..477b1e4 --- /dev/null +++ b/news/de/2011102101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. Oktober 2011</date> +<title>Wine 1.3.31 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.31 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.31">Neuerungen (en)</a> in dieser Version: +<ul> + <li>BiDi Textunterstützung im einzeiligen Edit Control.</li> + <li>Unterstützung für StretchDIBits und AlphaBlend in der DIB Engine.</li> + <li>Ein paar Audio Fehlerbehebungen.</li> + <li>VBScript Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.31
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: website Branch: master Commit: c4d1119708443832b4835723f291bc154adb6b04 URL: http://source.winehq.org/git/website.git/?a=commit;h=c4d1119708443832b48357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 20:48:30 2011 +0200 Wine release 1.3.31 --- news/en/2011102101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2011102101.xml b/news/en/2011102101.xml new file mode 100644 index 0000000..1832975 --- /dev/null +++ b/news/en/2011102101.xml @@ -0,0 +1,16 @@ +<news> +<date>October 21, 2011</date> +<title>Wine 1.3.31 Released</title> +<body> + The Wine development release 1.3.31 is now available. + <a href="{$root}/announce/1.3.31">What's new</a> in this release: +<ul> + <li>BiDi text support in the single-line edit control.</li> + <li>Support for StretchDIBits and AlphaBlend in the DIB engine.</li> + <li>A number of audio fixes.</li> + <li>VBScript improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.31.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 29c16f62e8d89971ba361b2db372eec8e0fcd138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c16f62e8d89971ba361b2db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 20:38:36 2011 +0200 Release 1.3.31. --- ANNOUNCE | 1076 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 562 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29c16f62e8d89971ba361…

1 0

Tag wine-1.3.31 : Alexandre Julliard : Release 1.3.31
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: refs/tags/wine-1.3.31 Tag: a6e549de1ca0f3c62356f8674d51c4284bcbeab5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a6e549de1ca0f3c62356f8674d51… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 20:38:36 2011 +0200 Release 1.3.31

1 0

Jacek Caban : hlink: Return S_FALSE in GetTargetFrameName when returning NULL.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 34db2d392692d51bbc88d6a56aa4157ce1f4a35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34db2d392692d51bbc88d6a56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 15:16:08 2011 +0200 hlink: Return S_FALSE in GetTargetFrameName when returning NULL. --- dlls/hlink/link.c | 8 ++++++++ dlls/mshtml/tests/htmldoc.c | 1 - 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 86b6ad6..a929782 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -437,7 +437,15 @@ static HRESULT WINAPI IHlink_fnGetTargetFrameName(IHlink* iface, HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%p)\n", This, ppwzTargetFrameName); + + if(!This->TargetFrameName) { + *ppwzTargetFrameName = NULL; + return S_FALSE; + } + *ppwzTargetFrameName = hlink_co_strdupW( This->TargetFrameName ); + if(!*ppwzTargetFrameName) + return E_OUTOFMEMORY; return S_OK; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 02c9eab..fb07417 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -745,7 +745,6 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB DWORD site_data = 0xdeadbeef; hres = IHlink_GetTargetFrameName(pihlNavigate, &frame_name); - todo_wine ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); ok(frame_name == NULL, "frame_name = %p\n", frame_name);

1 0