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

Henri Verbeet : wined3d: Fix the block alignment check in surface_cpu_blt() .
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: d26a3858d918520c58b5d1e597dabe428a58898a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26a3858d918520c58b5d1e59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 12:19:02 2012 +0200 wined3d: Fix the block alignment check in surface_cpu_blt(). --- dlls/wined3d/surface.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91ebcca..ea0baa4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6699,9 +6699,16 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * goto release; } - if (srcwidth & (src_format->block_width - 1) || srcheight & (src_format->block_height - 1)) + if (!surface_check_block_align(src_surface, src_rect)) { - WARN("Rectangle not block-aligned.\n"); + WARN("Source rectangle not block-aligned.\n"); + hr = WINED3DERR_INVALIDCALL; + goto release; + } + + if (!surface_check_block_align(dst_surface, dst_rect)) + { + WARN("Destination rectangle not block-aligned.\n"); hr = WINED3DERR_INVALIDCALL; goto release; }

1 0

Henri Verbeet : wined3d: Merge the device parent create_rendertarget() and create_depth_stencil() handlers.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 0821c8024bd04eebc1a5047ec62ce7cf76c552f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0821c8024bd04eebc1a5047ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 12:19:03 2012 +0200 wined3d: Merge the device parent create_rendertarget() and create_depth_stencil() handlers. --- dlls/d3d10core/device.c | 66 +++++++-------------------------------------- dlls/d3d8/device.c | 58 +++++++++------------------------------- dlls/d3d9/device.c | 66 ++++++++++++--------------------------------- dlls/ddraw/ddraw.c | 37 +++++++++---------------- dlls/dxgi/device.c | 2 +- dlls/wined3d/device.c | 9 +++--- dlls/wined3d/swapchain.c | 23 +++++++++------- dlls/wined3d/texture.c | 10 +++---- include/wine/wined3d.h | 12 +++----- 9 files changed, 83 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0821c8024bd04eebc1a50…

1 0

Huw Davies : ntdll: Increase the buffer size for processor features and add a check to catch future overflows .
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 760f487f6cbda0dc9f15403c987cfc68ec9bc134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760f487f6cbda0dc9f15403c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 11 11:46:14 2012 +0100 ntdll: Increase the buffer size for processor features and add a check to catch future overflows. --- dlls/ntdll/nt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6d6e0b0..4b3f83a 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1217,7 +1217,7 @@ void fill_cpu_info(void) unsigned long long longVal; int value; int cputype; - char buffer[256]; + char buffer[1024]; valSize = sizeof(int); if (sysctlbyname ("hw.optional.floatingpoint", &value, &valSize, NULL, 0) == 0) @@ -1280,6 +1280,7 @@ void fill_cpu_info(void) if (sysctlbyname ("machdep.cpu.features", buffer, &valSize, NULL, 0) == 0) { cached_sci.Revision |= value; + if (!valSize) FIXME("Buffer not large enough, please increase\n"); if (strstr(buffer, "CX8")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; if (strstr(buffer, "CX16")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = TRUE; if (strstr(buffer, "MMX")) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;

1 0

Huw Davies : ntdll: Remove a spurious assignment.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 59f7c2443252385e45ab0c29ccaed7d14165677d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f7c2443252385e45ab0c29c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 11 11:46:15 2012 +0100 ntdll: Remove a spurious assignment. --- dlls/ntdll/nt.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4b3f83a..cc35815 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1279,7 +1279,6 @@ void fill_cpu_info(void) valSize = sizeof(buffer); if (sysctlbyname ("machdep.cpu.features", buffer, &valSize, NULL, 0) == 0) { - cached_sci.Revision |= value; if (!valSize) FIXME("Buffer not large enough, please increase\n"); if (strstr(buffer, "CX8")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; if (strstr(buffer, "CX16")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = TRUE;

1 0

Jacek Caban : mshtml: Moved binding list to HTMLInnerWindow.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 94f0f884fdbe0a728695486db59acff1d9a0b199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f0f884fdbe0a728695486db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 13:51:00 2012 +0200 mshtml: Moved binding list to HTMLInnerWindow. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlwindow.c | 3 +- dlls/mshtml/mshtml_private.h | 9 ++++--- dlls/mshtml/navigate.c | 51 +++++++++++++++++++---------------------- dlls/mshtml/nsio.c | 6 ++-- dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 2 +- 8 files changed, 37 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94f0f884fdbe0a7286954…

1 0

Frédéric Delanoy : French translation for forums page
by Jeremy Newman 11 Jul '12

11 Jul '12

Module: website Branch: master Commit: ea4a8226e76f285f2c68c145a96080e590aed984 URL: http://source.winehq.org/git/website.git/?a=commit;h=ea4a8226e76f285f2c68c1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 11 11:11:44 2012 +0200 French translation for forums page --- templates/fr/forums.template | 110 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/templates/fr/forums.template b/templates/fr/forums.template new file mode 100644 index 0000000..1562740 --- /dev/null +++ b/templates/fr/forums.template @@ -0,0 +1,110 @@ + + + +<h1 class="title">Listes de diffusion principales / Forums</h1> + +Wine propose divers listes de diffusion et forums. +Voici les plus utiles pour les utilisateurs : + +<ul> + <li>Les <a href="http://forum.winehq.org">forums WineHQ</a></li> + + <li>La <a href="http://www.winehq.org/mailman/listinfo/wine-users">liste de discussion Wine-Users</a> (et l'<a href="http://www.winehq.org/pipermail/wine-users/">archive web</a>)</li> + + <li>Les utilisateurs Ubuntu peuvent également visiter l'<a href="http://ubuntuforums.org/forumdisplay.php?f=313">espace Wine des forums Ubuntu</a> + + <li>Les utilisateurs peuvent également visiter l'<a href="http://www.linuxforums.org/forum/wine/">espace Wine sur Linux Forums</a> + + <li>Si vous voulez être prévenu(e) des nouvelles versions, inscrivez-vous à la <a href="http://www.winehq.org/mailman/listinfo/wine-announce">liste de diffusion Wine-Announce</a></li> +</ul> + +Merci de ne pas créer de forum non-anglophone pour Wine (à part éventuellement un espace Wine dans le forum principal d'une distribution populaire). + +Si vous connaissez un autre forum Wine actif (en particulier un non-anglophone), merci de nous prévenir afin de pouvoir l'ajouter à la liste (un courriel à dank(a)kegel.com suffit). + +<h2>Tous les listes WineHQ</h2> + +WineHQ dispose de listes pour soumettre des patchs, suivre des commits Git, et discuter sur Wine. Elles permettent une configuration fine des inscriptions des utilisateurs, <a href="http://www.winehq.org/mailman/listinfo">via le Web</a> ou en envoyant un courriel à nom de la liste-request(a)winehq.org avec comme sujet +« subscribe ». Pour vous désinscrire, utilisez « unsubscribe mot de passe » en utilisant +le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="http://www.winehq.org/mailman/listinfo">l'interface Web Mailman</a>. + +Note : il est nécessaire d'être inscrit pour pouvoir poster, ou votre message sera considéré comme unpourriel potentiel par le logiciel de gestion de la liste. + +<ul class="roomy"> + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-announce">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-announce/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via un lecteur de nouvelles</a>] + <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> + Une liste bas trafic (2 messages par mois) en lecture seule annonçant les nouvelles versions et d'autres nouvelles majeures sur Wine ou WineHQ. + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-users">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-users/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via un lecteur de nouvelles</a>] + <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> + Une liste moyen trafic (50 messages par jour) pour les discussions des utilisateurs. + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-devel/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via un lecteur de nouvelles</a>] + <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> + Une liste moyen trafic (25 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-patches/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via un lecteur de nouvelles</a>] + <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + Une liste moyen trafic (35 messages par jour) en lecture seule pour le suivi des commits dans Git. + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-releases">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-releases/">Archive 1</a>] + <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> + Une liste bas trafic (2 messages par mois) en lecture seule pour la réception de fichiers diff conséquents lors de la sortie d'une version officielle de Wine. + </li> + + <li> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">Archive 1</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via un lecteur de nouvelles</a>] + + Une liste clôturée qui était utilisée pour la discussion de points juridiques relatifs à Wine, y compris des problèmes de licences (fermée le 16/12/2004). + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-bugs">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-bugs/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via un lecteur de nouvelles</a>] + <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> + Une liste haut trafic (150 messages par jour) en lecture seule pour la surveillances des activités sur la + <a href="http://bugs.winehq.org/">base de données de suivi de bogues</a>. + </li> + + <li> + [<a href="http://www.winehq.org/mailman/listinfo/wine-tests-results">(Dés-)inscription</a>] + [<a href="http://www.winehq.org/pipermail/wine-tests-results/">Archive</a>] + <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> + Une liste moyen trafic (10 messages par jour) pour la soumission de résultats de tests. + </li> + +</ul>

1 0

Frédéric Delanoy : French translation for release 1.5.8
by Jeremy Newman 11 Jul '12

11 Jul '12

Module: website Branch: master Commit: a3a56e3bfc5d33378e5c1516ed504f0931f94b9e URL: http://source.winehq.org/git/website.git/?a=commit;h=a3a56e3bfc5d33378e5c15… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 11 11:11:45 2012 +0200 French translation for release 1.5.8 --- news/fr/2012070301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012070301.xml b/news/fr/2012070301.xml new file mode 100644 index 0000000..c74883a --- /dev/null +++ b/news/fr/2012070301.xml @@ -0,0 +1,16 @@ +<news> +<date>3 juillet 2012</date> +<title>Sortie de Wine 1.5.8</title> +<body> + La version de développement 1.5.8 de Wine est disponible. + <a href="{$root}/announce/1.5.8">Nouveautés</a> de cette version : +<ul> + <li>Fonctionnalités de flux additionnelles dans le moteur d'exécution C++.</li> + <li>Quelques améliorations aux codecs Windows.</li> + <li>Classes et propriétés WBEM supplémentaires.</li> + <li>Correctifs pour l'aide HTML.</li> + <li>Prise en charge de l'impression de polices italiques factices.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.8.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

Henri Verbeet : wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget().
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 9b74ebd79404c867aadb723ffa2ab34b3bf741cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b74ebd79404c867aadb723ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:37 2012 +0200 wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget(). --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 12 ++++-------- dlls/wined3d/swapchain.c | 12 ++++-------- include/wine/wined3d.h | 2 +- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 637109f..60849a3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1400,7 +1400,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); @@ -1409,9 +1409,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; FIXME("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p partial stub!\n", + "\tmultisample_quality %u, surface %p partial stub!\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c135012..31f0eb2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2856,7 +2856,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); @@ -2864,12 +2864,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, - multisample_type, multisample_quality, lockable, surface); + multisample_type, multisample_quality, surface); hr = IDirect3DDevice8_CreateRenderTarget(&device->IDirect3DDevice8_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, lockable, (IDirect3DSurface8 **)&d3d_surface); + d3dformat_from_wined3dformat(format), multisample_type, TRUE, (IDirect3DSurface8 **)&d3d_surface); if (FAILED(hr)) { WARN("Failed to create rendertarget, hr %#x.\n", hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 04a073d..ef5aa46 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3210,7 +3210,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); @@ -3218,12 +3218,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); hr = d3d9_device_CreateRenderTarget(&device->IDirect3DDevice9Ex_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, lockable, + d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, TRUE, (IDirect3DSurface9 **)&d3d_surface, NULL); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d628629..d613d17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5444,17 +5444,16 @@ static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops = static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - DWORD flags = 0; HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); if (ddraw->wined3d_frontbuffer) { @@ -5462,12 +5461,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par return E_FAIL; } - if (lockable) - flags |= WINED3D_SURFACE_MAPPABLE; - hr = wined3d_surface_create(ddraw->wined3d_device, width, height, format, 0, WINED3DUSAGE_RENDERTARGET, WINED3D_POOL_DEFAULT, multisample_type, multisample_quality, - DefaultSurfaceType, flags, ddraw, &ddraw_frontbuffer_parent_ops, surface); + DefaultSurfaceType, WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, surface); if (SUCCEEDED(hr)) ddraw->wined3d_frontbuffer = *surface; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c69fad..4aeabfb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -943,12 +943,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->front_buffer); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->front_buffer))) { WARN("Failed to create front buffer, hr %#x.\n", hr); goto err; @@ -1053,12 +1051,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->back_buffers[i]); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4576937..6709d28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2002,7 +2002,7 @@ struct wined3d_device_parent_ops UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); HRESULT (__cdecl *create_rendertarget)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface); + DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_depth_stencil)(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface);

1 0

Henri Verbeet : wined3d: Get rid of the "discard" parameter to device_parent_create_depth_stencil().
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 8ad98cdbeec665670170c880e1589002567c3a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad98cdbeec665670170c880e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:38 2012 +0200 wined3d: Get rid of the "discard" parameter to device_parent_create_depth_stencil(). --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 17 ++++++----------- dlls/wined3d/swapchain.c | 6 ++---- include/wine/wined3d.h | 2 +- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 60849a3..3fd0c49 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1444,7 +1444,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); struct d3d10_texture2d *texture; @@ -1452,8 +1452,8 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa HRESULT hr; FIXME("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p partial stub!\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); + "\tmultisample_quality %u, surface %p partial stub!\n", + device_parent, width, height, format, multisample_type, multisample_quality, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 31f0eb2..50a09e9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2888,15 +2888,15 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; HRESULT hr; TRACE("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p.\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); + "\tmultisample_quality %u, surface %p.\n", + device_parent, width, height, format, multisample_type, multisample_quality, surface); hr = IDirect3DDevice8_CreateDepthStencilSurface(&device->IDirect3DDevice8_iface, width, height, d3dformat_from_wined3dformat(format), multisample_type, (IDirect3DSurface8 **)&d3d_surface); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ef5aa46..1f195d6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3243,19 +3243,19 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; HRESULT hr; TRACE("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p.\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); + "\tmultisample_quality %u, surface %p.\n", + device_parent, width, height, format, multisample_type, multisample_quality, surface); hr = d3d9_device_CreateDepthStencilSurface(&device->IDirect3DDevice9Ex_iface, width, height, d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, - discard, (IDirect3DSurface9 **)&d3d_surface, NULL); + FALSE, (IDirect3DSurface9 **)&d3d_surface, NULL); if (FAILED(hr)) { WARN("Failed to create depth/stencil surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d613d17..4e2be26 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5472,7 +5472,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { ERR("DirectDraw doesn't have and shouldn't try creating implicit depth buffers.\n"); return E_NOTIMPL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0acbded..0b74142 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5230,21 +5230,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil && !device->auto_depth_stencil) { - HRESULT hrc; + HRESULT hr; TRACE("Creating the depth stencil buffer\n"); - hrc = device->device_parent->ops->create_depth_stencil(device->device_parent, - swapchain_desc->backbuffer_width, - swapchain_desc->backbuffer_height, - swapchain_desc->auto_depth_stencil_format, - swapchain_desc->multisample_type, - swapchain_desc->multisample_quality, - FALSE, - &device->auto_depth_stencil); - if (FAILED(hrc)) + if (FAILED(hr = device->device_parent->ops->create_depth_stencil(device->device_parent, + swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height, + swapchain_desc->auto_depth_stencil_format, swapchain_desc->multisample_type, + swapchain_desc->multisample_quality, &device->auto_depth_stencil))) { - ERR("Failed to create the depth stencil buffer.\n"); + ERR("Failed to create the depth stencil buffer, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4aeabfb..a389497 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1070,12 +1070,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil) { - hr = device->device_parent->ops->create_depth_stencil(device->device_parent, + if (FAILED(hr = device->device_parent->ops->create_depth_stencil(device->device_parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.auto_depth_stencil_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, FALSE /* FIXME: Discard */, - &device->auto_depth_stencil); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &device->auto_depth_stencil))) { WARN("Failed to create the auto depth stencil, hr %#x.\n", hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6709d28..5049360 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2005,7 +2005,7 @@ struct wined3d_device_parent_ops DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_depth_stencil)(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface); + DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_volume)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, UINT depth, enum wined3d_format_id format_id, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume);

1 0

Henri Verbeet : wined3d: Print a more obvious message if a format doesn' t have a corresponding GL internal format.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 2907913fad3118800b675a8b52ae9dcaea191fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2907913fad3118800b675a8b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:39 2012 +0200 wined3d: Print a more obvious message if a format doesn't have a corresponding GL internal format. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95a5072..2d37cdf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2661,6 +2661,9 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru internal = format->glInternal; } + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator;

1 0