[PATCH 0/1] MR8189: d3d10: Return S_OK from parse_fx10_annotations instead of variable hr.

[Bernhard Übelacker (＠bernhardu)]

In case of annotations->count equals to zero the function
returned an uninitialized value from the variable hr.

Was observed in llvm-mingw builds.

[PATCH 1/1] d3d10: Return S_OK from parse_fx10_annotations instead of variable hr.

[Bernhard Übelacker]

From: Bernhard Übelacker

In case of annotations->count equals to zero the function
returned an uninitialized value from the variable hr.

Was observed in llvm-mingw builds.
---
 dlls/d3d10/effect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index f27a128f15d..52a94f413f5 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -2431,7 +2431,7 @@ static HRESULT parse_fx10_annotations(const char *data, size_t data_size, const
             return hr;
     }

-    return hr;
+    return S_OK;
 }

static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, D3D_SHADER_VARIABLE_TYPE basetype,

[PATCH 0/1] MR8189: d3d10: Return S_OK from parse_fx10_annotations instead of variable hr. - approved

[Matteo Bruni (＠Mystral)]

This merge request was approved by Matteo Bruni.