From baa980036bbabd0e66467545b21510ce3e51e6bf Mon Sep 17 00:00:00 2001 From: James Tabor Date: Tue, 10 Jun 2008 05:48:18 +0000 Subject: [PATCH] Fix build, add float to long union for dword transfer. svn path=/trunk/; revision=33918 --- reactos/dll/win32/gdi32/objects/arc.c | 7 ++++++- reactos/subsystems/win32/win32k/objects/arc.c | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/gdi32/objects/arc.c b/reactos/dll/win32/gdi32/objects/arc.c index 001e9274e1e..f1761a4c0a5 100644 --- a/reactos/dll/win32/gdi32/objects/arc.c +++ b/reactos/dll/win32/gdi32/objects/arc.c @@ -64,6 +64,11 @@ AngleArc(HDC hDC, FLOAT StartAngle, FLOAT SweepAngle) { + gxf_long worker, worker1; + + worker.f = StartAngle; + worker1.f = SweepAngle; + #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) @@ -87,7 +92,7 @@ AngleArc(HDC hDC, } } #endif - return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)StartAngle, (DWORD)SweepAngle); + return NtGdiAngleArc(hDC, X, Y, Radius, (DWORD)worker.l, (DWORD)worker1.l); } BOOL diff --git a/reactos/subsystems/win32/win32k/objects/arc.c b/reactos/subsystems/win32/win32k/objects/arc.c index 1dd398313d8..696691f5947 100644 --- a/reactos/subsystems/win32/win32k/objects/arc.c +++ b/reactos/subsystems/win32/win32k/objects/arc.c @@ -469,7 +469,7 @@ IntGdiArcInternal( BOOL APIENTRY NtGdiAngleArc( - IN HDC hdc, + IN HDC hDC, IN INT x, IN INT y, IN DWORD dwRadius, @@ -477,7 +477,8 @@ NtGdiAngleArc( IN DWORD dwSweepAngle) { DC *dc; - BOOL Ret = FASLE; + BOOL Ret = FALSE; + gxf_long worker, worker1; dc = DC_LockDc (hDC); if(!dc) @@ -491,11 +492,11 @@ NtGdiAngleArc( /* Yes, Windows really returns TRUE in this case */ return TRUE; } - + worker.l = dwStartAngle; + worker1.l = dwSweepAngle; DC_UnlockDc( dc ); return Ret; - } BOOL