[ros-diffs] [reactos] 115/218: [WINESYNC] d3dx9: Make qsort() callback functions cdecl.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ff51fd68e9c3c392cc4e…

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

    [WINESYNC] d3dx9: Make qsort() callback functions cdecl.
    
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 08b569d50599328df1531f20cceb5331bf718524 by Alexandre Julliard
<julliard(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/mesh.c      | 6 +++---
 dll/directx/wine/d3dx9_36/preshader.c | 2 +-
 sdk/tools/winesync/d3dx9.cfg          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c
index 2b664a0e51c..6c6628a1127 100644
--- a/dll/directx/wine/d3dx9_36/mesh.c
+++ b/dll/directx/wine/d3dx9_36/mesh.c
@@ -1212,7 +1212,7 @@ struct vertex_metadata {
   DWORD first_shared_index;
 };
 
-static int compare_vertex_keys(const void *a, const void *b)
+static int __cdecl compare_vertex_keys(const void *a, const void *b)
 {
     const struct vertex_metadata *left = a;
     const struct vertex_metadata *right = b;
@@ -1590,7 +1590,7 @@ static void fill_attribute_table(DWORD *attrib_buffer, DWORD
numfaces, void *ind
     attrib_table_size++;
 }
 
-static int attrib_entry_compare(const void *a, const void *b)
+static int __cdecl attrib_entry_compare(const void *a, const void *b)
 {
     const DWORD *ptr_a = *(const DWORD **)a;
     const DWORD *ptr_b = *(const DWORD **)b;
@@ -5845,7 +5845,7 @@ static D3DXVECTOR2 *triangulation_get_next_point(struct
triangulation *t, struct
     return &outline->items[i].pos;
 }
 
-static int compare_vertex_indices(const void *a, const void *b)
+static int __cdecl compare_vertex_indices(const void *a, const void *b)
 {
     const struct point2d_index *idx1 = a, *idx2 = b;
     const D3DXVECTOR2 *p1 = &idx1->outline->items[idx1->vertex].pos;
diff --git a/dll/directx/wine/d3dx9_36/preshader.c
b/dll/directx/wine/d3dx9_36/preshader.c
index cf418b98879..c80cea73b74 100644
--- a/dll/directx/wine/d3dx9_36/preshader.c
+++ b/dll/directx/wine/d3dx9_36/preshader.c
@@ -650,7 +650,7 @@ static void append_pres_const_sets_for_shader_input(struct
d3dx_const_tab *const
     }
 }
 
-static int compare_const_set(const void *a, const void *b)
+static int __cdecl compare_const_set(const void *a, const void *b)
 {
     const struct d3dx_const_param_eval_output *r1 = a;
     const struct d3dx_const_param_eval_output *r2 = b;
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 585a4be6be8..8d20a58c4fb 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: 15dd8e2b981ca32cae94409153627b3300bbeab8}
+tags: {wine: 08b569d50599328df1531f20cceb5331bf718524}