wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

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

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

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

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: Introduce a helper function for checking surface block alignment.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 1e22e3ccfbabc0b71ae71517fa8633d3e412ebf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e22e3ccfbabc0b71ae71517f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 12:19:01 2012 +0200 wined3d: Introduce a helper function for checking surface block alignment. --- dlls/wined3d/surface.c | 62 +++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2d37cdf..91ebcca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2520,6 +2520,27 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ return WINED3D_OK; } +static BOOL surface_check_block_align(struct wined3d_surface *surface, const RECT *rect) +{ + UINT width_mask, height_mask; + + if (!rect->left && !rect->top + && rect->right == surface->resource.width + && rect->bottom == surface->resource.height) + return TRUE; + + /* This assumes power of two block sizes, but NPOT block sizes would be + * silly anyway. */ + width_mask = surface->resource.format->block_width - 1; + height_mask = surface->resource.format->block_height - 1; + + if (!(rect->left & width_mask) && !(rect->top & height_mask) + && !(rect->right & width_mask) && !(rect->bottom & height_mask)) + return TRUE; + + return FALSE; +} + HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { @@ -2533,9 +2554,9 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P UINT update_w, update_h; UINT dst_w, dst_h; UINT src_w, src_h; + RECT r, dst_rect; UINT src_pitch; POINT p; - RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), @@ -2593,22 +2614,23 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - /* NPOT block sizes would be silly. */ - if ((src_format->flags & WINED3DFMT_FLAG_BLOCKS) - && ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) - && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h))) + if ((src_format->flags & WINED3DFMT_FLAG_BLOCKS) && !surface_check_block_align(src_surface, src_rect)) { - WARN("Update rect not block-aligned.\n"); + WARN("Source rectangle not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } + + SetRect(&dst_rect, dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h); + if ((dst_format->flags & WINED3DFMT_FLAG_BLOCKS) && !surface_check_block_align(dst_surface, &dst_rect)) + { + WARN("Destination rectangle not block-aligned.\n"); return WINED3DERR_INVALIDCALL; } /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ d3dfmt_get_conv(dst_surface, FALSE, TRUE, &format, &convert); if (convert != WINED3D_CT_NONE || format.convert) - { - RECT dst_rect = {dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h}; return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); - } context = context_acquire(dst_surface->resource.device, NULL); gl_info = context->gl_info; @@ -3859,23 +3881,15 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; } - if ((format->flags & WINED3DFMT_FLAG_BLOCKS) - && rect && (rect->left || rect->top - || rect->right != surface->resource.width - || rect->bottom != surface->resource.height)) - { - UINT width_mask = format->block_width - 1; - UINT height_mask = format->block_height - 1; - if ((rect->left & width_mask) || (rect->right & width_mask) - || (rect->top & height_mask) || (rect->bottom & height_mask)) - { - WARN("Map rect %s is misaligned for %ux%u blocks.\n", - wine_dbgstr_rect(rect), format->block_width, format->block_height); + if ((format->flags & WINED3DFMT_FLAG_BLOCKS) && rect + && !surface_check_block_align(surface, rect)) + { + WARN("Map rect %s is misaligned for %ux%u blocks.\n", + wine_dbgstr_rect(rect), format->block_width, format->block_height); - if (surface->resource.pool == WINED3D_POOL_DEFAULT) - return WINED3DERR_INVALIDCALL; - } + if (surface->resource.pool == WINED3D_POOL_DEFAULT) + return WINED3DERR_INVALIDCALL; } ++surface->resource.map_count;

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

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@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@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@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@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@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@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@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@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

Thomas Faber : ntdll/tests: Add test for RtlIpv4StringToAddress.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: a7e95a27fbb04539268a8eb38095e8c3ddc7a315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e95a27fbb04539268a8eb38… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jul 9 18:34:25 2012 +0200 ntdll/tests: Add test for RtlIpv4StringToAddress. --- dlls/ntdll/tests/rtl.c | 174 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7e95a27fbb04539268a8…

1 0

Rico Schüller : d3dx9/tests: Fix array increment in SetMatrix*PointerArray() test.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: e0d5c35054a55721b186f12be9b5e989f14a7a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d5c35054a55721b186f12be… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:12:30 2012 +0200 d3dx9/tests: Fix array increment in SetMatrix*PointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 712cf8c..d416213 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2352,7 +2352,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; } hr = effect->lpVtbl->SetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) @@ -2462,7 +2462,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; } hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element)

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixTransposePointerArray() test.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 617a2ccee60ad391ef0f00826a5c314e95a58c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=617a2ccee60ad391ef0f00826… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:12:15 2012 +0200 d3dx9/tests: Add effect parameter value GetMatrixTransposePointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 960c7f2..712cf8c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1631,6 +1631,83 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes } } +static void test_effect_parameter_value_GetMatrixTransposePointerArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; + UINT l, k, m, element; + + for (element = 0; element <= res_desc->Elements + 1; ++element) + { + memset(fvalue, 0xab, sizeof(fvalue)); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + } + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); + if (!element) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (m = 0; m < element; ++m) + { + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l + k * 4, fvalue[m * 16 + l + k * 4], + get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + + l * res_desc->Columns + k])); + } + else + { + ok(fvalue[m * 16 + l + k * 4] == 0.0f, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l + k * 4, fvalue[m * 16 + l + k * 4], 0.0f); + } + } + } + } + + for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposePointerArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + } +} + static void test_effect_parameter_value_GetTestGroup(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { @@ -1648,6 +1725,7 @@ static void test_effect_parameter_value_GetTestGroup(const struct test_effect_pa test_effect_parameter_value_GetMatrixPointerArray(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixTranspose(res, effect, res_value, parameter, i); test_effect_parameter_value_GetMatrixTransposeArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrixTransposePointerArray(res, effect, res_value, parameter, i); } static void test_effect_parameter_value_ResetValue(const struct test_effect_parameter_value_result *res, @@ -1948,6 +2026,18 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, NULL, NULL, 0); + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, NULL, NULL, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetValue(effect, NULL, input_value, res_desc->Bytes); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL);

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
72
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 July 2012