April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the correct mask for depth/ stencil locations in surface_load_ds_location().
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: a5983e0c3d2a60e1455014bead99334f00349acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5983e0c3d2a60e1455014bea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 15 18:33:36 2011 +0200 wined3d: Use the correct mask for depth/stencil locations in surface_load_ds_location(). --- dlls/wined3d/surface.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6daf886..4a72183 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4404,8 +4404,13 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte return; } - if (!(surface->flags & SFLAG_LOCATIONS)) + if (!(surface->flags & SFLAG_DS_LOCATIONS)) { + /* This mostly happens when a depth / stencil is used without being + * cleared first. In principle we could upload from sysmem, or + * explicitly clear before first usage. For the moment there don't + * appear to be a lot of applications depending on this, so a FIXME + * should do. */ FIXME("No up to date depth stencil location.\n"); surface->flags |= location; return;

1 0

Henri Verbeet : wined3d: Forward surface refcounts to the container.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: fadfdf21c055caf833a137ffc269c2073dc87fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadfdf21c055caf833a137ffc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 15 18:33:37 2011 +0200 wined3d: Forward surface refcounts to the container. This will prevent textures from being released if one of its surfaces is still in use by the stateblock. We have similar constructions in d3d8 and d3d9, but those won't prevent the wined3d texture from being released. --- dlls/wined3d/surface.c | 37 ++++++++++++++++++++++++++++--------- dlls/wined3d/surface_base.c | 31 ++++++++++++++++++++++++++----- dlls/wined3d/surface_gdi.c | 39 ++++++++++++++++++++++++++++++--------- 3 files changed, 84 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4a72183..c7a3571 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1376,20 +1376,39 @@ HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - ULONG ref = InterlockedDecrement(&This->resource.ref); - TRACE("(%p) : Releasing from %d\n", This, ref + 1); + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + ULONG refcount; + + TRACE("Surface %p, container %p of type %#x.\n", + surface, surface->container.u.base, surface->container.type); + + switch (surface->container.type) + { + case WINED3D_CONTAINER_TEXTURE: + return wined3d_texture_decref(surface->container.u.texture); + + case WINED3D_CONTAINER_SWAPCHAIN: + return wined3d_swapchain_decref(surface->container.u.swapchain); + + default: + ERR("Unhandled container type %#x.\n", surface->container.type); + case WINED3D_CONTAINER_NONE: + break; + } + + refcount = InterlockedDecrement(&surface->resource.ref); + TRACE("%p decreasing refcount to %u.\n", surface, refcount); - if (!ref) + if (!refcount) { - surface_cleanup(This); - This->resource.parent_ops->wined3d_object_destroyed(This->resource.parent); + surface_cleanup(surface); + surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); - TRACE("(%p) Released.\n", This); - HeapFree(GetProcessHeap(), 0, This); + TRACE("Destroyed surface %p.\n", surface); + HeapFree(GetProcessHeap(), 0, surface); } - return ref; + return refcount; } /* **************************************************** diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 906c7ef..0705719 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -102,11 +102,32 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface, RE return E_NOINTERFACE; } -ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - ULONG ref = InterlockedIncrement(&This->resource.ref); - TRACE("(%p) : AddRef increasing from %d\n", This,ref - 1); - return ref; +ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + ULONG refcount; + + TRACE("Surface %p, container %p of type %#x.\n", + surface, surface->container.u.base, surface->container.type); + + switch (surface->container.type) + { + case WINED3D_CONTAINER_TEXTURE: + return wined3d_texture_incref(surface->container.u.texture); + + case WINED3D_CONTAINER_SWAPCHAIN: + return wined3d_swapchain_incref(surface->container.u.swapchain); + + default: + ERR("Unhandled container type %#x.\n", surface->container.type); + case WINED3D_CONTAINER_NONE: + break; + } + + refcount = InterlockedIncrement(&surface->resource.ref); + TRACE("%p increasing refcount to %u.\n", surface, refcount); + + return refcount; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index db9cf8b..0cb675b 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -114,20 +114,41 @@ static const struct wined3d_surface_ops gdi_surface_ops = * to destroy all the GL things. * *****************************************************************************/ -static ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - ULONG ref = InterlockedDecrement(&This->resource.ref); - TRACE("(%p) : Releasing from %d\n", This, ref + 1); +static ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + ULONG refcount; + + TRACE("Surface %p, container %p of type %#x.\n", + surface, surface->container.u.base, surface->container.type); + + switch (surface->container.type) + { + case WINED3D_CONTAINER_TEXTURE: + return wined3d_texture_decref(surface->container.u.texture); + + case WINED3D_CONTAINER_SWAPCHAIN: + return wined3d_swapchain_decref(surface->container.u.swapchain); + + default: + ERR("Unhandled container type %#x.\n", surface->container.type); + case WINED3D_CONTAINER_NONE: + break; + } + + refcount = InterlockedDecrement(&surface->resource.ref); + TRACE("%p decreasing refcount to %u.\n", surface, refcount); - if (!ref) + if (!refcount) { - surface_gdi_cleanup(This); + surface_gdi_cleanup(surface); + surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); - TRACE("(%p) Released.\n", This); - HeapFree(GetProcessHeap(), 0, This); + TRACE("Destroyed surface %p.\n", surface); + HeapFree(GetProcessHeap(), 0, surface); } - return ref; + return refcount; } /*****************************************************************************

1 0

Henri Verbeet : wined3d: Forward volume refcounts to the container.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 38800d8e9af1ea2e96358530f68bd48634672878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38800d8e9af1ea2e96358530f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 15 18:33:38 2011 +0200 wined3d: Forward volume refcounts to the container. --- dlls/wined3d/volume.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 251265b..66d7d6d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -128,7 +128,15 @@ static void volume_unload(struct wined3d_resource *resource) ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) { - ULONG refcount = InterlockedIncrement(&volume->resource.ref); + ULONG refcount; + + if (volume->container) + { + TRACE("Forwarding to container %p.\n", volume->container); + return wined3d_texture_incref(volume->container); + } + + refcount = InterlockedIncrement(&volume->resource.ref); TRACE("%p increasing refcount to %u.\n", volume, refcount); @@ -138,7 +146,15 @@ ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) /* Do not call while under the GL lock. */ ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) { - ULONG refcount = InterlockedDecrement(&volume->resource.ref); + ULONG refcount; + + if (volume->container) + { + TRACE("Forwarding to container %p.\n", volume->container); + return wined3d_texture_decref(volume->container); + } + + refcount = InterlockedDecrement(&volume->resource.ref); TRACE("%p decreasing refcount to %u.\n", volume, refcount);

1 0

Alexandre Julliard : msvcr90: Fix function pointer declaration that confuses winapi_extract.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: ed64b3761deeb052e16452317e150218dc210b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed64b3761deeb052e16452317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 21:02:42 2011 +0200 msvcr90: Fix function pointer declaration that confuses winapi_extract. --- dlls/msvcr90/msvcr90.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index f2adb04..fe563e3 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -66,8 +66,8 @@ typedef struct __type_info char mangled[32]; /* Variable length, but we declare it large enough for static RTTI */ } type_info; -typedef void* (*__cdecl malloc_func_t)(size_t); -typedef void (*__cdecl free_func_t)(void*); +typedef void* (__cdecl *malloc_func_t)(size_t); +typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.18
by Jeremy Newman April 18, 2011

April 18, 2011

Module: website Branch: master Commit: 4ea95f68d1215bf5a558200c839ec2cd9603292b URL: http://source.winehq.org/git/website.git/?a=commit;h=4ea95f68d1215bf5a55820… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Apr 15 20:16:48 2011 +0200 Polish translation for release 1.3.18 --- news/pl/2011041501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2011041501.xml b/news/pl/2011041501.xml new file mode 100644 index 0000000..19515ae --- /dev/null +++ b/news/pl/2011041501.xml @@ -0,0 +1,18 @@ +<news> +<date>Kwiecień 15, 2011</date> +<title>Wydano Wine 1.3.18</title> +<body> + Wydanie rozwojowe Wine 1.3.18 jest już dostępne. + <a href="{$root}/announce/1.3.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla obcinania wskaźnika myszki.</li> + <li>Wsparcie dla 'surowych' zdarzeń myszki przy użyciu XInput2.</li> + <li>Pierwsze kroki w implementacji silnika DIB.</li> + <li>Wsparcie dla większej liczby właściwości w DXDiag.</li> + <li>Nowa zakładka 'bezpieczeństwo' w ustawieniach internetu w panelu sterowania.</li> + <li>Ulepszone odtwarzanie materiałów wideo na Mac OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.18.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.18 freigegeben
by Jeremy Newman April 18, 2011

April 18, 2011

Module: website Branch: master Commit: fab0dc7a2a99081a8f659b6be54c4ebb142bba7c URL: http://source.winehq.org/git/website.git/?a=commit;h=fab0dc7a2a99081a8f659b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 16 12:53:30 2011 +0200 Wine 1.3.18 freigegeben --- news/de/2011041501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2011041501.xml b/news/de/2011041501.xml new file mode 100644 index 0000000..2ee2af6 --- /dev/null +++ b/news/de/2011041501.xml @@ -0,0 +1,18 @@ +<news> +<date>15. April 2011</date> +<title>Wine 1.3.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für das Einfangen des Mauszeigers.</li> + <li>Unverarbeitete Maus Ereignisse werden durch XInput2 unterstützt.</li> + <li>Erste Schritte einer DIB-Engine Implementation.</li> + <li>Unterstützung für mehr Eigenschaften in DXDiag.</li> + <li>Neuer Sicherheitstab in der Internet Systemsteuerung.</li> + <li>Verbessertes Video Playback unter Mac OS X.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.18.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

Frédéric Delanoy : French translation for release 1.3.18 (try 2)
by Jeremy Newman April 18, 2011

April 18, 2011

Module: website Branch: master Commit: e125f34d46500e9cf543a7a25c3b121bbbf36117 URL: http://source.winehq.org/git/website.git/?a=commit;h=e125f34d46500e9cf543a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 17 00:35:34 2011 +0200 French translation for release 1.3.18 (try 2) --- news/fr/2011041501.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2011041501.xml b/news/fr/2011041501.xml new file mode 100644 index 0000000..8573ffb --- /dev/null +++ b/news/fr/2011041501.xml @@ -0,0 +1,21 @@ +<news> +<date>15 avril 2011</date> +<title>Sortie de Wine 1.3.18</title> +<body> + La version de développement 1.3.18 de Wine est disponible. + <a href="{$root}/announce/1.3.18">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du clipping du pointeur de souris.</li> + <li>Prise en charge des événements bruts de souris XInput2.</li> + <li>Premières étapes dans l'implémentation d'un moteur DIB.</li> + <li>Propriétés additionnelles dans DXDiag.</li> + <li>Nouvel onglet de sécurité dans le panneau de contrôle Internet.</li> + <li>Lecture de vidéos améliorée sous Mac OS X.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.18.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

Frédéric Delanoy : French translation for release 1.3.12
by Jeremy Newman April 18, 2011

April 18, 2011

Module: website Branch: master Commit: 6b549da270dbf29515242eb06c5594f6cf1ed9bc URL: http://source.winehq.org/git/website.git/?a=commit;h=6b549da270dbf29515242e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 17 00:42:47 2011 +0200 French translation for release 1.3.12 --- news/fr/2011012101.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011012101.xml b/news/fr/2011012101.xml new file mode 100644 index 0000000..32397fe --- /dev/null +++ b/news/fr/2011012101.xml @@ -0,0 +1,20 @@ +<news> +<date>21 janvier 2011</date> +<title>Sortie de Wine 1.3.12</title> +<body> + La version de développement 1.3.12 de Wine est disponible. + <a href="{$root}/announce/1.3.12">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de différentes tailles d'icônes dans winemenubuilder.</li> + <li>Améliorations au navigateur d'aide.</li> + <li>Première ébauche d'intégration de DOSBox.</li> + <li>Divers correctifs MSI.</li> + <li>Correctifs pour le débogueur Wine.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.12.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

Alexandre Julliard : Wine release 1.3.18
by Alexandre Julliard April 15, 2011

April 15, 2011

Module: website Branch: master Commit: 18a188578193b2ed3fd0171352289d038d19214f URL: http://source.winehq.org/git/website.git/?a=commit;h=18a188578193b2ed3fd017… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 19:49:11 2011 +0200 Wine release 1.3.18 --- news/en/2011041501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011041501.xml b/news/en/2011041501.xml new file mode 100644 index 0000000..0e5af4f --- /dev/null +++ b/news/en/2011041501.xml @@ -0,0 +1,18 @@ +<news> +<date>April 15, 2011</date> +<title>Wine 1.3.18 Released</title> +<body> + The Wine development release 1.3.18 is now available. + <a href="{$root}/announce/1.3.18">What's new</a> in this release: +<ul> + <li>Support for mouse pointer clipping.</li> + <li>Raw mouse events support using XInput2.</li> + <li>First steps of a DIB engine implementation.</li> + <li>More properties supported in DXDiag.</li> + <li>New security tab in the Internet control panel.</li> + <li>Improved video playback on Mac OS X.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.18.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

Tag wine-1.3.18 : Alexandre Julliard : Release 1.3.18
by Alexandre Julliard April 15, 2011

April 15, 2011

Module: wine Branch: refs/tags/wine-1.3.18 Tag: 22872f4d3044a140a66911fd3255de5170f90f1c URL: http://source.winehq.org/git/wine.git/?a=tag;h=22872f4d3044a140a66911fd3255… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 19:34:30 2011 +0200 Release 1.3.18

1 0