[ros-diffs] [reactos] 11/218: [WINESYNC] d3dx9: Simplify get_parameter_by_name().

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a939c57a86af89f76c6a…

commit 0a939c57a86af89f76c6ae96cbc4dd14e1df9ad6
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 22:40:24 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:01 2021 +0100

    [WINESYNC] d3dx9: Simplify get_parameter_by_name().
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 4a9fe7a8a092095420532ae734ebce9978b1e608 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/effect.c | 8 +++-----
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 0f228b9c39e..b2f8ecf6c2a 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -922,7 +922,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect
*base,
         return NULL;
     }
 
-    /* Pass / technique annotations are not in the parameters tree. */
     if (parameter->full_name)
     {
         name_len = strlen(name);
@@ -952,9 +951,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect
*base,
         return NULL;
     }
 
+    /* Pass / technique annotations are not stored in the parameters tree,
+     * do a linear search. */
     count = parameter->member_count;
 
-    length = strcspn( name, "[.@" );
+    length = strcspn( name, "[." );
     part = name + length;
 
     for (i = 0; i < count; i++)
@@ -973,9 +974,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect
*base,
                 case '.':
                     return get_parameter_by_name(base, temp_parameter, part);
 
-                case '@':
-                    return NULL;
-
                 case '[':
                     return get_parameter_element_by_name(base, temp_parameter, part);
 
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 595b923bc3c..45210a2bbe7 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: eb0eaf7027797c6a99b4b5ecdb70c5ba336dccc2}
+tags: {wine: 4a9fe7a8a092095420532ae734ebce9978b1e608}