From a8e2d9b747e90a7299838560d5b274175afc77ab Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 27 Feb 2010 15:09:59 +0000 Subject: [PATCH] Move GUID comparison macro to wdm.h svn path=/branches/header-work/; revision=45700 --- include/ddk/wdm.h | 16 ++++++++++++++++ include/ddk/winddk.h | 17 ----------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 45179790335..3db6a241fde 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -71,6 +71,22 @@ extern "C" { #define ALIGN_UP_POINTER(p, t) \ (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) +/* + * GUID Comparison + */ + +#ifndef __IID_ALIGNED__ + #define __IID_ALIGNED__ + #ifdef __cplusplus + inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) + { + return ((*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1))); + } + #else + #define IsEqualGUIDAligned(guid1, guid2) \ + ((*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1))) + #endif +#endif /* Simple types */ typedef UCHAR KPROCESSOR_MODE; diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h index 094efc9d96f..27bc4f1841f 100644 --- a/include/ddk/winddk.h +++ b/include/ddk/winddk.h @@ -74,23 +74,6 @@ extern "C" { # define _DDK_DUMMYUNION_N_MEMBER(n, name) name #endif -/* - * GUID Comparison - */ - -#ifndef __IID_ALIGNED__ - #define __IID_ALIGNED__ - #ifdef __cplusplus - inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) - { - return ((*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1))); - } - #else - #define IsEqualGUIDAligned(guid1, guid2) \ - ((*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1))) - #endif -#endif - /* ** Forward declarations */ -- 2.17.1