[PATCH 2/3] d2d1: Implement D2D1Tan
Giovanni Mascellani
wine at mascellani.eu
Sun Oct 25 10:49:02 CDT 2020
Signed-off-by: Giovanni Mascellani <wine at mascellani.eu>
---
dlls/d2d1/d2d1.spec | 2 +-
dlls/d2d1/factory.c | 5 +++++
dlls/d2d1/tests/d2d1.c | 22 +++++++++++++++++++++-
include/d2d1_1.idl | 1 +
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec
index 410abfa5de6..7b624c7096e 100644
--- a/dlls/d2d1/d2d1.spec
+++ b/dlls/d2d1/d2d1.spec
@@ -7,5 +7,5 @@
@ stdcall D2D1CreateDevice(ptr ptr ptr)
@ stub D2D1CreateDeviceContext
@ stdcall D2D1SinCos(float ptr ptr)
-@ stub D2D1Tan
+@ stdcall D2D1Tan(float)
@ stub D2D1Vec3Length
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index 2cce8afc4a4..d21520bb8c3 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -719,6 +719,11 @@ void WINAPI D2D1SinCos(float angle, float *s, float *c)
*c = cosf(angle);
}
+float WINAPI D2D1Tan(float angle)
+{
+ return tanf(angle);
+}
+
static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value)
{
DWORD type, data, size;
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 9ec86eac3a5..2bad058feb1 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -9427,7 +9427,7 @@ static void test_wic_bitmap_format(void)
static void test_math(void)
{
- float s, c;
+ float s, c, t;
int i;
static const struct
@@ -9445,12 +9445,32 @@ static void test_math(void)
{M_PI, -8.74227766e-008, -1.0},
};
+ static const struct
+ {
+ float x;
+ float t;
+ }
+ t_data[] =
+ {
+ {0.0, 0.0},
+ {1.0, 1.55740774},
+ {2.0, -2.18503976},
+ {M_PI / 2.0, -2.28773320e+007},
+ {M_PI, 8.74227766e-008},
+ };
+
for (i = 0; i < ARRAY_SIZE(sc_data); ++i)
{
D2D1SinCos(sc_data[i].x, &s, &c);
ok(compare_float(s, sc_data[i].s, 0), "Wrong sin(%.8e) (%.8e instead of %.8e).\n", sc_data[i].x, s, sc_data[i].s);
ok(compare_float(c, sc_data[i].c, 0), "Wrong cos(%.8e) (%.8e instead of %.8e).\n", sc_data[i].x, c, sc_data[i].c);
}
+
+ for (i = 0; i < ARRAY_SIZE(t_data); ++i)
+ {
+ t = D2D1Tan(t_data[i].x);
+ ok(compare_float(t, t_data[i].t, 1), "Wrong tan(%.8e) (%.8e instead of %.8e).\n", t_data[i].x, t, t_data[i].t);
+ }
}
START_TEST(d2d1)
diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
index 6fa893edbda..bd111bd6628 100644
--- a/include/d2d1_1.idl
+++ b/include/d2d1_1.idl
@@ -795,3 +795,4 @@ interface ID2D1Factory1 : ID2D1Factory
[local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device,
const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device);
[local] void __stdcall D2D1SinCos(float angle, float *s, float *c);
+[local] float __stdcall D2D1Tan(float angle);
--
2.28.0
More information about the wine-devel
mailing list