Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Build with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9fb5745a7997bbfe033779650f1193d85369cef2 by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:52:25 +02:00 committed by Jérôme Gardou
parent bbc438a5d5
commit 224d70bd0c
20 changed files with 13 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/directx/wine/d3dx9_36/animation.c
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/core.c
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/effect.c
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdio.h>
#include <assert.h>

5
dll/directx/wine/d3dx9_36/font.c
View file

@ -20,11 +20,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#include "wine/unicode.h"
#endif /* __REACTOS__ */
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@ -270,7 +267,7 @@ HRESULT WINAPI D3DXCreateFontW(IDirect3DDevice9 *device, INT height, UINT width,
desc.OutputPrecision=precision;
desc.Quality=quality;
desc.PitchAndFamily=pitchandfamily;
if(facename != NULL) strcpyW(desc.FaceName, facename);
if(facename != NULL) lstrcpyW(desc.FaceName, facename);
else desc.FaceName[0] = '\0';
return D3DXCreateFontIndirectW(device, &desc, font);

2
dll/directx/wine/d3dx9_36/line.c
View file

@ -20,8 +20,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/main.c
View file

@ -23,8 +23,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "initguid.h"
#include "d3dx9_private.h"

4
dll/directx/wine/d3dx9_36/math.c
View file

@ -25,8 +25,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <float.h>
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

18
dll/directx/wine/d3dx9_36/mesh.c
View file

@ -28,20 +28,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <assert.h>
#ifdef HAVE_FLOAT_H
# include <float.h>
#endif
#include <float.h>
#include "d3dx9_private.h"
#undef MAKE_DDHRESULT
#include "dxfile.h"
#include "rmxfguid.h"
#include "rmxftmpl.h"
#include "wine/unicode.h"
#include "wine/list.h"
#endif /* __REACTOS__ */
@ -1595,10 +1590,10 @@ static void fill_attribute_table(DWORD *attrib_buffer, DWORD numfaces, void *ind
attrib_table_size++;
}
static int attrib_entry_compare(const DWORD **a, const DWORD **b)
static int attrib_entry_compare(const void *a, const void *b)
{
const DWORD *ptr_a = *a;
const DWORD *ptr_b = *b;
const DWORD *ptr_a = *(const DWORD **)a;
const DWORD *ptr_b = *(const DWORD **)b;
int delta = *ptr_a - *ptr_b;
if (delta)
@ -1628,8 +1623,7 @@ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *in
for (i = 0; i < This->numfaces; i++)
sorted_attrib_ptr_buffer[i] = &attrib_buffer[i];
qsort(sorted_attrib_ptr_buffer, This->numfaces, sizeof(*sorted_attrib_ptr_buffer),
(int(*)(const void *, const void *))attrib_entry_compare);
qsort(sorted_attrib_ptr_buffer, This->numfaces, sizeof(*sorted_attrib_ptr_buffer), attrib_entry_compare);
for (i = 0; i < This->numfaces; i++)
{
@ -6162,7 +6156,7 @@ HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const W
}
oldfont = SelectObject(hdc, font);
textlen = strlenW(text);
textlen = lstrlenW(text);
for (i = 0; i < textlen; i++)
{
int datasize = GetGlyphOutlineW(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity);

7
dll/directx/wine/d3dx9_36/preshader.c
View file

@ -19,12 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#include <float.h>
#include <math.h>
#include <assert.h>
#endif /* __REACTOS__ */
@ -135,11 +134,7 @@ static double pres_log(double *args, int n)
if (v == 0.0)
return 0.0;
else
#ifdef HAVE_LOG2
return log2(v);
#else
return log(v) / log(2);
#endif
}
static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));}
static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));}

2
dll/directx/wine/d3dx9_36/render.c
View file

@ -20,8 +20,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/shader.c
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#include "d3dcommon.h"

2
dll/directx/wine/d3dx9_36/skin.c
View file

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/sprite.c
View file

@ -20,8 +20,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/surface.c
View file

@ -21,8 +21,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"

2
dll/directx/wine/d3dx9_36/texture.c
View file

@ -22,8 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/util.c
View file

@ -20,8 +20,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/volume.c
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#endif /* __REACTOS__ */

2
dll/directx/wine/d3dx9_36/xfile.c
View file

@ -20,8 +20,6 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "d3dx9_private.h"
#include "d3dx9xof.h"

4
modules/rostests/winetests/d3dx9_36/math.c
View file

@ -4046,7 +4046,7 @@ static void test_D3DXSHMultiply3(void)
D3DXSHMultiply3(c, c, b);
for (i = 0; i < ARRAY_SIZE(expected_aliased); ++i)
{
equal = compare_float(c[i], expected_aliased[i], 32);
equal = compare_float(c[i], expected_aliased[i], 34);
ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected_aliased[i], c[i]);
}
}
@ -4324,7 +4324,7 @@ static void test_D3DXSHRotateZ(void)
expected = ( i + 1.0f ) * ( i + 1.0f );
else
expected = table[36 * (l + 3 * j) + i];
equal = compare_float(expected, out_temp[i], 256);
equal = compare_float(expected, out_temp[i], 512);
ok(equal || (fabs(expected) < 2.0e-5f && fabs(out_temp[i]) < 2.0e-5f),
"angle %.8e, order %u index %u, expected %.8e, received %.8e.\n",
angle[j], order, i, expected, out_temp[i]);

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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: a16ef96dc624edf2666aa125fbc1c197f5edcc1b}
tags: {wine: 9fb5745a7997bbfe033779650f1193d85369cef2}