mirror of
https://github.com/reactos/reactos.git
synced 2024-08-08 12:18:13 +00:00
FLOATOBJ is a structure only on x86 in kernelmode, for usermode drivers and other architectures it's a FLOAT. Update winddi.h accordingly.
svn path=/trunk/; revision=34555
This commit is contained in:
parent
a5e5e742fd
commit
ea50e3e05c
|
@ -544,11 +544,15 @@ typedef struct _FD_KERNINGPAIR {
|
||||||
FWORD fwdKern;
|
FWORD fwdKern;
|
||||||
} FD_KERNINGPAIR;
|
} FD_KERNINGPAIR;
|
||||||
|
|
||||||
|
#if defined(_X86_) && !defined(USERMODE_DRIVER)
|
||||||
typedef struct _FLOATOBJ
|
typedef struct _FLOATOBJ
|
||||||
{
|
{
|
||||||
ULONG ul1;
|
ULONG ul1;
|
||||||
ULONG ul2;
|
ULONG ul2;
|
||||||
} FLOATOBJ, *PFLOATOBJ;
|
} FLOATOBJ, *PFLOATOBJ;
|
||||||
|
#else
|
||||||
|
typedef FLOAT FLOATOBJ, *PFLOATOBJ;
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct _FLOATOBJ_XFORM {
|
typedef struct _FLOATOBJ_XFORM {
|
||||||
FLOATOBJ eM11;
|
FLOATOBJ eM11;
|
||||||
|
@ -2287,6 +2291,7 @@ EngWritePrinter(
|
||||||
IN DWORD cbBuf,
|
IN DWORD cbBuf,
|
||||||
OUT LPDWORD pcWritten);
|
OUT LPDWORD pcWritten);
|
||||||
|
|
||||||
|
#if defined(_X86_) && !defined(USERMODE_DRIVER)
|
||||||
WIN32KAPI
|
WIN32KAPI
|
||||||
VOID
|
VOID
|
||||||
APIENTRY
|
APIENTRY
|
||||||
|
@ -2445,6 +2450,34 @@ FLOATOBJ_SubLong(
|
||||||
IN OUT PFLOATOBJ pf,
|
IN OUT PFLOATOBJ pf,
|
||||||
IN LONG l);
|
IN LONG l);
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#define FLOATOBJ_SetFloat(pf, f) {*(pf) = (f);}
|
||||||
|
#define FLOATOBJ_SetLong(pf, l) {*(pf) = (FLOAT)(l);}
|
||||||
|
#define FLOATOBJ_GetFloat(pf) (*(PULONG)(pf))
|
||||||
|
#define FLOATOBJ_GetLong(pf) ((LONG)*(pf))
|
||||||
|
#define FLOATOBJ_Add(pf, pf1) {*(pf) += *(pf1);}
|
||||||
|
#define FLOATOBJ_AddFloat(pf, f) {*(pf) += (f);}
|
||||||
|
#define FLOATOBJ_AddLong(pf, l) {*(pf) += (l);}
|
||||||
|
#define FLOATOBJ_Sub(pf, pf1) {*(pf) -= *(pf1);}
|
||||||
|
#define FLOATOBJ_SubFloat(pf, f) {*(pf) -= (f);}
|
||||||
|
#define FLOATOBJ_SubLong(pf, l) {*(pf) -= (l);}
|
||||||
|
#define FLOATOBJ_Mul(pf, pf1) {*(pf) *= *(pf1);}
|
||||||
|
#define FLOATOBJ_MulFloat(pf, f) {*(pf) *= (f);}
|
||||||
|
#define FLOATOBJ_MulLong(pf, l) {*(pf) *= (l);}
|
||||||
|
#define FLOATOBJ_Div(pf, pf1) {*(pf) /= *(pf1);}
|
||||||
|
#define FLOATOBJ_DivFloat(pf, f) {*(pf) /= (f);}
|
||||||
|
#define FLOATOBJ_DivLong(pf, l) {*(pf) /= (l);}
|
||||||
|
#define FLOATOBJ_Neg(pf) {*(pf) = -(*(pf));}
|
||||||
|
#define FLOATOBJ_Equal(pf, pf1) (*(pf) == *(pf1))
|
||||||
|
#define FLOATOBJ_GreaterThan(pf, pf1) (*(pf) > *(pf1))
|
||||||
|
#define FLOATOBJ_LessThan(pf, pf1) (*(pf) < *(pf1))
|
||||||
|
#define FLOATOBJ_EqualLong(pf, 1) (*(pf) == (FLOAT)(1))
|
||||||
|
#define FLOATOBJ_GreaterThanLong(pf, 1) (*(pf) > (FLOAT)(1))
|
||||||
|
#define FLOATOBJ_LessThanLong(pf, 1) (*(pf) < (FLOAT)(1))
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
WIN32KAPI
|
WIN32KAPI
|
||||||
ULONG
|
ULONG
|
||||||
APIENTRY
|
APIENTRY
|
||||||
|
|
Loading…
Reference in a new issue