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

Michael Stefaniuc : strmbase: Remove break after return (Smatch).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 8a8ba19eafe64170bd7df984a5c3d2d4891bc137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8ba19eafe64170bd7df984a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 16:36:41 2012 +0200 strmbase: Remove break after return (Smatch). --- dlls/strmbase/window.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 7de66a9..aa9214a 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -194,7 +194,6 @@ BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg case WM_RBUTTONUP: PostMessageW(pControlWindow->hwndDrain, uMsg, wParam, lParam); return TRUE; - break; default: break; }

1 0

Nikolay Sivov : msxml3: Use expected/ actual sequence concept for reader tests including attributes tests.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: bcd858547b237161b803852a663289abb1dd4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd858547b237161b803852a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 15 13:47:30 2012 +0400 msxml3: Use expected/actual sequence concept for reader tests including attributes tests. --- dlls/msxml3/saxreader.c | 19 +- dlls/msxml3/tests/saxreader.c | 1580 ++++++++++++++++++++++++++--------------- 2 files changed, 1030 insertions(+), 569 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd858547b237161b8038…

1 0

Henri Verbeet : d3d10core: COM cleanup for the ID3D10Buffer interface.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 0a9ac7e992824f28b81dc0f3f5a14deed4d781b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9ac7e992824f28b81dc0f3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:11 2012 +0200 d3d10core: COM cleanup for the ID3D10Buffer interface. --- dlls/d3d10core/buffer.c | 47 +++++++++++++++++++++++------------- dlls/d3d10core/d3d10core_private.h | 5 +++- dlls/d3d10core/device.c | 10 ++++--- dlls/d3d10core/inputlayout.c | 1 - dlls/d3d10core/shader.c | 1 - dlls/d3d10core/view.c | 1 - 6 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index fd2175e..90ff0e8 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -24,11 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static inline struct d3d10_buffer *impl_from_ID3D10Buffer(ID3D10Buffer *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_buffer, ID3D10Buffer_iface); +} + /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_ID3D10Buffer) || IsEqualGUID(riid, &IID_ID3D10Resource) @@ -36,40 +41,38 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface || IsEqualGUID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) { - struct d3d10_buffer *This = (struct d3d10_buffer *)iface; - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + ULONG refcount = InterlockedIncrement(&buffer->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", buffer, refcount); if (refcount == 1) - wined3d_buffer_incref(This->wined3d_buffer); + wined3d_buffer_incref(buffer->wined3d_buffer); return refcount; } static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) { - struct d3d10_buffer *This = (struct d3d10_buffer *)iface; - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + ULONG refcount = InterlockedDecrement(&buffer->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) - { - wined3d_buffer_decref(This->wined3d_buffer); - } + wined3d_buffer_decref(buffer->wined3d_buffer); return refcount; } @@ -132,7 +135,7 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { - struct d3d10_buffer *buffer = (struct d3d10_buffer *)iface; + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); @@ -146,9 +149,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) { + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + TRACE("iface %p.\n", iface); - wined3d_buffer_unmap(((struct d3d10_buffer *)iface)->wined3d_buffer); + wined3d_buffer_unmap(buffer->wined3d_buffer); } static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) @@ -177,6 +182,14 @@ static const struct ID3D10BufferVtbl d3d10_buffer_vtbl = d3d10_buffer_GetDesc, }; +struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_buffer_vtbl); + return CONTAINING_RECORD(iface, struct d3d10_buffer, ID3D10Buffer_iface); +} + static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) { HeapFree(GetProcessHeap(), 0, parent); @@ -193,7 +206,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi struct wined3d_buffer_desc wined3d_desc; HRESULT hr; - buffer->vtbl = &d3d10_buffer_vtbl; + buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; buffer->refcount = 1; FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index d99a337..5f320e0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -21,6 +21,8 @@ #include "wine/debug.h" +#include <assert.h> + #define COBJMACROS #include "winbase.h" #include "wingdi.h" @@ -111,7 +113,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic /* ID3D10Buffer */ struct d3d10_buffer { - const struct ID3D10BufferVtbl *vtbl; + ID3D10Buffer ID3D10Buffer_iface; LONG refcount; struct wined3d_buffer *wined3d_buffer; @@ -119,6 +121,7 @@ struct d3d10_buffer HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; +struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilView */ struct d3d10_depthstencil_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cf21bba..637109f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -203,9 +203,10 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac for (i = 0; i < buffer_count; ++i) { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + wined3d_device_set_stream_source(This->wined3d_device, start_slot, - buffers[i] ? ((struct d3d10_buffer *)buffers[i])->wined3d_buffer : NULL, - offsets[i], strides[i]); + buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } } @@ -213,12 +214,13 @@ static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface, ID3D10Buffer *buffer, DXGI_FORMAT format, UINT offset) { struct d3d10_device *This = impl_from_ID3D10Device(iface); + struct d3d10_buffer *buffer_impl = unsafe_impl_from_ID3D10Buffer(buffer); TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); wined3d_device_set_index_buffer(This->wined3d_device, - buffer ? ((struct d3d10_buffer *)buffer)->wined3d_buffer : NULL, + buffer_impl ? buffer_impl->wined3d_buffer : NULL, wined3dformat_from_dxgi_format(format)); if (offset) FIXME("offset %u not supported.\n", offset); } @@ -644,7 +646,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, return hr; } - *buffer = (ID3D10Buffer *)object; + *buffer = &object->ID3D10Buffer_iface; TRACE("Created ID3D10Buffer %p\n", object); diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index d6ae787..09b8998 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -19,7 +19,6 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> #include "d3d10core_private.h" diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 82ddadc..c6803ed 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -19,7 +19,6 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> #include "d3d10core_private.h" diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 57c4148..57473e4 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -19,7 +19,6 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> #define NONAMELESSUNION #include "d3d10core_private.h"

1 0

Frédéric Delanoy : French translation for release 1.5.2
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: 51052a6f1a2e3f1f7a8bbcb750841c195fc6b9c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=51052a6f1a2e3f1f7a8bbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 13 20:44:02 2012 +0200 French translation for release 1.5.2 --- news/fr/2012041301.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2012041301.xml b/news/fr/2012041301.xml new file mode 100644 index 0000000..1f484ad --- /dev/null +++ b/news/fr/2012041301.xml @@ -0,0 +1,20 @@ +<news> +<date>13 avril 2012</date> +<title>Sortie de Wine 1.5.2</title> +<body> + La version de développement 1.5.2 de Wine est disponible. + <a href="{$root}/announce/1.5.2">Nouveautés</a> de cette version : +<ul> + <li>Canevas de nommage amélioré pour les périphériques audios.</li> + <li>Meilleure prise en charge de la découverte de polices système sous Mac OS X.</li> + <li>Ébauche de support du codage JPEG.</li> + <li>Divers correctifs pour l'impression.</li> + <li>Améliorations au cache d'URL.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.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

André Hentschel : Wine 1.5.2 freigegeben
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: c2bf8a22318f6cf45ae9702e298fbd2ad0839dba URL: http://source.winehq.org/git/website.git/?a=commit;h=c2bf8a22318f6cf45ae970… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 14 13:04:49 2012 +0200 Wine 1.5.2 freigegeben --- news/de/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012041301.xml b/news/de/2012041301.xml new file mode 100644 index 0000000..ad84ba9 --- /dev/null +++ b/news/de/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>13. April 2012</date> +<title>Wine 1.5.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Namensgebung für Audio Geräte.</li> + <li>Verbesserte Unterstützung um Systemschriftarten unter Mac OS X zu finden.</li> + <li>Anfänge einer Unterstützung für JPEG Kodierung.</li> + <li>Mehrer Fehlerbehebungen beim Drucken.</li> + <li>Verbesserungen am URL Cache.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Eduardo García : Spanish translation for release 1.5.2
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: 7d194b8caf4bbc783e6dddbc905a77bcf028d3c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=7d194b8caf4bbc783e6ddd… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat Apr 14 16:15:46 2012 +0200 Spanish translation for release 1.5.2 With regards. Eduardo >From 976d0aa981abb288006888c7e96cdce3947ad71c Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 14 Apr 2012 16:06:46 +0200 Subject: Spanish translation for release 1.5.2 --- news/es/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/es/2012041301.xml b/news/es/2012041301.xml new file mode 100644 index 0000000..368e510 --- /dev/null +++ b/news/es/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>Abril 13, 2012</date> +<title>Wine 1.5.2 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.2 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.2">Novedades</a> en esta versión: +<ul> + <li>Mejorada la nomenclatura para dispositivos de audio.</li> + <li>Soporte mejorado para la localización de fuentes del sistema en Mac OS X.</li> + <li>Inicios del soporte para la codificación JPEG.</li> + <li>Varias mejoras en la impresión.</li> + <li>Mejoras en la caché de URLs.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

hasan kiran : Turkish translation for release 1.5.2‏
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: e081c96759cd7408369305a1380869bad7a3bae9 URL: http://source.winehq.org/git/website.git/?a=commit;h=e081c96759cd7408369305… Author: hasan kiran <sunder67(a)hotmail.com> Date: Sat Apr 14 14:19:16 2012 +0000 Turkish translation for release 1.5.2‏ --_78a6ce78-4b8c-4c84-823f-251a6940b706_ Content-Type: text/plain; charset="windows-1256" Content-Transfer-Encoding: 8bit <html> <head> <style></style></head> <body class='hmmessage'><div dir='ltr'> </div></body> </html> --- news/tr/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/tr/2012041301.xml b/news/tr/2012041301.xml new file mode 100644 index 0000000..a3019a6 --- /dev/null +++ b/news/tr/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>13 Nisan 2012</date> +<title>Wine 1.5.2 Yayınlandı</title> +<body> + Wine 1.5.2 geliştirme sürümü şimdi kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.5.2">yenilikler</a> : +<ul> + <li>Ses cihazları için gelişmiş adlandırma şeması.</li> + <li>Mac OS X sistem yazı tiplerini bulmak için daha iyi destek.</li> + <li>JPEG kodlama için destek başlangıcı.</li> + <li>Çeşitli baskı düzeltmeleri.</li> + <li>URL önbellek geliştirmeleri.</li> + <li>Çeşitli hata düzeltmeleri.</li> +</ul> +Kaynağı <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">artık kullanımda</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news>

1 0

Alasdair Sinclair : Fix bug list in release announcement
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: 46ecfe23067a261412287cadf52fb18ac5af6301 URL: http://source.winehq.org/git/website.git/?a=commit;h=46ecfe23067a261412287c… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Sun Apr 15 17:27:46 2012 +0100 Fix bug list in release announcement Regards Alasdair --- include/plugins/announce.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 6faaae2..5000fc5 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -39,7 +39,7 @@ if ($arr = file($announce)) } else if ($in_bugs) { - $arr[$c] = preg_replace("^/( +)([0-9]+)/", + $arr[$c] = preg_replace("/^( +)([0-9]+)/", "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); }

1 0

Alexandre Julliard : Wine release 1.5.2
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: website Branch: master Commit: b7bb05802b4d21fbab5e0967d53ad8927f8c2c67 URL: http://source.winehq.org/git/website.git/?a=commit;h=b7bb05802b4d21fbab5e09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 20:26:22 2012 +0200 Wine release 1.5.2 --- news/en/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012041301.xml b/news/en/2012041301.xml new file mode 100644 index 0000000..7e9b396 --- /dev/null +++ b/news/en/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>April 13, 2012</date> +<title>Wine 1.5.2 Released</title> +<body> + The Wine development release 1.5.2 is now available. + <a href="{$root}/announce/1.5.2">What's new</a> in this release: +<ul> + <li>Improved naming scheme for audio devices.</li> + <li>Better support for finding system fonts on Mac OS X.</li> + <li>Beginnings of support for JPEG encoding.</li> + <li>Several printing fixes.</li> + <li>Improvements to the URL cache.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.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.5.2.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: c6a673291da6e9ee956910f35efcde0a8d8437ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a673291da6e9ee956910f35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 20:15:32 2012 +0200 Release 1.5.2. --- ANNOUNCE | 856 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 466 insertions(+), 410 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6a673291da6e9ee95691…

1 0