wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Henri Verbeet : d3d10core: Avoid LPVOID.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 6d02c19f2be9273e17f41b51100ea29ff7b97887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d02c19f2be9273e17f41b511… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:40 2013 +0200 d3d10core: Avoid LPVOID. --- dlls/d3d10core/d3d10core_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 78826f6..abc8434 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -25,14 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(inst); break; }

1 0

Henri Verbeet : d3d10core: Avoid LPSTR.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 592b347c79ddeaf895def4b0232ff9ee05db45f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592b347c79ddeaf895def4b02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:39 2013 +0200 d3d10core: Avoid LPSTR. --- dlls/d3d10core/device.c | 4 ++-- include/d3d10.idl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index c40a353..e694a80 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1610,8 +1610,8 @@ static void STDMETHODCALLTYPE d3d10_device_CheckCounterInfo(ID3D10Device *iface, } static HRESULT STDMETHODCALLTYPE d3d10_device_CheckCounter(ID3D10Device *iface, - const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, LPSTR name, - UINT *name_length, LPSTR units, UINT *units_length, LPSTR description, UINT *description_length) + const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, char *name, + UINT *name_length, char *units, UINT *units_length, char *description, UINT *description_length) { FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p,\n" "\tunits %p, units_length %p, description %p, description_length %p stub!\n", diff --git a/include/d3d10.idl b/include/d3d10.idl index 73a9e62..9f84400 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -1559,11 +1559,11 @@ interface ID3D10Device : IUnknown [in] const D3D10_COUNTER_DESC *pDesc, [out] D3D10_COUNTER_TYPE *pType, [out] UINT *pActiveCounters, - [out] LPSTR szName, + [out] char *name, [in, out] UINT *pNameLength, - [out] LPSTR szUnits, + [out] char *units, [in, out] UINT *pUnitsLength, - [out] LPSTR szDescription, + [out] char *description, [in, out] UINT *pDescriptionLength); UINT GetCreationFlags(); HRESULT OpenSharedResource(

1 0

Henri Verbeet : ddraw: Verify that the surface is a render target in d3d_device_create().
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: d2d0c42b6d037fa954633a397306f557ef8bfe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d0c42b6d037fa954633a397… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:38 2013 +0200 ddraw: Verify that the surface is a render target in d3d_device_create(). --- dlls/ddraw/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 66e0b7f..7510ed8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6745,6 +6745,13 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", ddraw, target, version, device, outer_unknown); + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + WARN("Surface %p is not a render target.\n", target); + return DDERR_INVALIDCAPS; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Henri Verbeet : ddraw: Don't set render target / depth stencil usage on sysmem surfaces.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 3fb53e21fb2cccf249ed65a4641eac21422f6609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb53e21fb2cccf249ed65a46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:37 2013 +0200 ddraw: Don't set render target / depth stencil usage on sysmem surfaces. Setting render target usage on a P8 surface for example would fail surface creation, while such surfaces can't be used for actual rendering anyway. Tests confirm that surface creation is supposed to succeed for P8 surfaces with both DDSCAPS_SYSTEMMEMORY and DDSCAPS_3DDEVICE set. --- dlls/ddraw/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d23fc9c..416c13f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5740,9 +5740,12 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; - if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && !(desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + if (!(desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) { - usage |= WINED3DUSAGE_RENDERTARGET; + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + usage |= WINED3DUSAGE_DEPTHSTENCIL; + else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + usage |= WINED3DUSAGE_RENDERTARGET; } if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) @@ -5750,9 +5753,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, usage |= WINED3DUSAGE_OVERLAY; } - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - usage |= WINED3DUSAGE_DEPTHSTENCIL; - if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) usage |= WINED3DUSAGE_OWNDC;

1 0

Henri Verbeet : ddraw: Fix render target refcount handling.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: df01e8d6ccd30d0278b6a999dbd984c901f150dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df01e8d6ccd30d0278b6a999d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:36 2013 +0200 ddraw: Fix render target refcount handling. Similar to AddAttachedSurface() / DeleteAttachedSurface(), we should Release the interface version that we stored. (And actually store the interface that we AddRef.) --- dlls/ddraw/ddraw.c | 15 ++++--- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 102 +++++++++++++++++-------------------------- dlls/ddraw/surface.c | 7 ++- 4 files changed, 55 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df01e8d6ccd30d0278b6a…

1 0

André Hentschel : More protocol relative urls in the German translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: d09cc7261ccbeed6104f47be4bc79714873911c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=d09cc7261ccbeed6104f47… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:10:18 2013 +0200 More protocol relative urls in the German translation --- templates/de/about.template | 2 +- templates/de/help.template | 12 ++++++------ templates/de/home.template | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 1e2e5dc..0e461da 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -11,7 +11,7 @@ Wine wird immer <a href="http://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software (en)</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers (en)</a>, die eine eigene Version von Wine mit Support verkaufen. -Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren (en)</a> kommen von Freiwilligen. +Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="//appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="//forums.winehq.org/" title="WineHQ Foren">Foren (en)</a> kommen von Freiwilligen. <h3>Erfahre mehr:</h3> <ul> diff --git a/templates/de/help.template b/templates/de/help.template index e21dca1..1f414e2 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -57,10 +57,10 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://forums.winehq.org/"><img src="{$root}/images/forum.png"> Forum</a> + <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"> Forum</a> </td> <td valign="top"> - Wir haben eine <a href="http://forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email-basierte (en)</a> + Wir haben eine <a href="//forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email-basierte (en)</a> Gemeinschaft von Wine-Anwendern, in der Anwender Fragen stellen und miteinander netzwerken können. Des weiteren gibt es die <a href="{$root}/site/forums">Mailing Lists</a>, die Teil der gleichen Gemeinschaft sind. @@ -79,20 +79,20 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> + <a href="//appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> </td> <td valign="top"> Falls Du Unterstützung für eine bestimmte Anwendung suchst, ist unsere Anwendungsdatenbank - <a href="http://appdb.winehq.org/">AppDB (en)</a> ein guter Anlaufpunkt. + <a href="//appdb.winehq.org/">AppDB (en)</a> ein guter Anlaufpunkt. </td> </tr> <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> + <a href="//bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> </td> <td valign="top"> - Unser Bug Tracking-System <a href="http://bugs.winehq.org/">Bugzilla (en)</a> enthält Informationen + Unser Bug Tracking-System <a href="//bugs.winehq.org/">Bugzilla (en)</a> enthält Informationen zu allen Problemen, an denen wir jemals gearbeitet haben oder gerade arbeiten. </td> </tr> diff --git a/templates/de/home.template b/templates/de/home.template index c71f3f7..668a41d 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -62,14 +62,14 @@ <td style="padding-left: 15px; padding-bottom: 2px;"> <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Neuerungen (en)</a>) + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_stable_release}">Neuerungen (en)</a>) </td></tr> <tr><td>Entwicklungsversion:</td> <td style="padding-left: 15px;"> <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Neuerungen (en)</a>) + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_master_release}">Neuerungen (en)</a>) </td></tr> </table>

1 0

André Hentschel : More protocol relative urls in the Spanish translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 6b4fdf6c9e4ce96b5df9fcb6313cc6e398231b21 URL: http://source.winehq.org/git/website.git/?a=commit;h=6b4fdf6c9e4ce96b5df9fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:55 2013 +0200 More protocol relative urls in the Spanish translation --- templates/es/about.template | 2 +- templates/es/home.template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/es/about.template b/templates/es/about.template index 2d6799b..1135f90 100644 --- a/templates/es/about.template +++ b/templates/es/about.template @@ -11,7 +11,7 @@ Wine siempre será <a href="http://wiki.winehq.org/Licensing" title="Wine licensing">software libre</a>. Aproximadamente la mitad del código fuente de Wine es escrito por voluntarios. El resto es patrocinado por intereses comerciales, especialmente de <a href="http://www.codeweavers.com/products/" title="CodeWeavers CrossOver Office">CodeWeavers</a> quienes venden una versión de Wine con soporte. -Wine depende altamente en su comunidad de usuarios. Sus pruebas llenan nuestra <a href="http://appdb.winehq.org/" title="Wine Application Database">Base de datos de Aplicaciones</a> para seguir que tan bien funcionan los programas, y todas las respuestas en los <a href="http://forums.winehq.org/" title="WineHQ Forums">foros</a> vienen de voluntarios. +Wine depende altamente en su comunidad de usuarios. Sus pruebas llenan nuestra <a href="//appdb.winehq.org/" title="Wine Application Database">Base de datos de Aplicaciones</a> para seguir que tan bien funcionan los programas, y todas las respuestas en los <a href="//forums.winehq.org/" title="WineHQ Forums">foros</a> vienen de voluntarios. <h3>Aprenda mas:</h3> <ul> diff --git a/templates/es/home.template b/templates/es/home.template index 8cbf5bb..b8a86b6 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -62,14 +62,14 @@ <td style="padding-left: 15px; padding-bottom: 2px;"> <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">cambios</a>) + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_stable_release}">cambios</a>) </td></tr> <tr><td>Desarrollo:</td> <td style="padding-left: 15px;"> <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">cambios</a>) + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_master_release}">cambios</a>) </td></tr> </table>

1 0

André Hentschel : More protocol relative urls in the French translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 2558702ee86c991227ab0226f00e0243e978b3a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2558702ee86c991227ab02… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:53 2013 +0200 More protocol relative urls in the French translation --- templates/fr/about.template | 4 +- templates/fr/forums.template | 44 +++++++++++++++++++++--------------------- templates/fr/help.template | 12 +++++----- templates/fr/home.template | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2558702ee86c991227…

1 0

André Hentschel : More protocol relative urls in the Polish translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 6ee6a6902e6e24caa3b6865b094059c4423ec9aa URL: http://source.winehq.org/git/website.git/?a=commit;h=6ee6a6902e6e24caa3b686… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:51 2013 +0200 More protocol relative urls in the Polish translation --- templates/pl/about.template | 4 +- templates/pl/forums.template | 44 +++++++++++++++++++++--------------------- templates/pl/help.template | 12 +++++----- templates/pl/home.template | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=6ee6a6902e6e24caa3…

1 0

André Hentschel : More protocol relative urls in the Turkish translation
by Jeremy Newman 17 Sep '13

17 Sep '13

Module: website Branch: master Commit: 11d860141f2ffc9024d2f1dbd405cd800aeb0239 URL: http://source.winehq.org/git/website.git/?a=commit;h=11d860141f2ffc9024d2f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:48 2013 +0200 More protocol relative urls in the Turkish translation --- templates/tr/about.template | 6 ++-- templates/tr/forums.template | 44 ++++++++++++++++++++-------------------- templates/tr/help.template | 12 +++++----- templates/tr/home.template | 4 +- templates/tr/license.template | 6 ++-- 5 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=11d860141f2ffc9024…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013