Puetz Kevin A : include: Use unsigned int in InlineIsEqualGUID.
Alexandre Julliard
julliard at winehq.org
Thu Jul 16 19:01:20 CDT 2020
Module: wine
Branch: master
Commit: aa4f8daf999c31025c076c031dfffb7c3de5b473
URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4f8daf999c31025c076c031dfffb7c3de5b473
Author: Puetz Kevin A <PuetzKevinA at JohnDeere.com>
Date: Thu Jul 16 21:15:38 2020 +0200
include: Use unsigned int in InlineIsEqualGUID.
This fixes stand-alone inclusion of <guiddef.h>
(without first including <basetsd.h>).
Signed-off-by: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/guiddef.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/guiddef.h b/include/guiddef.h
index 664f74fac3..a25b3a7107 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -156,18 +156,18 @@ typedef GUID FMTID,*LPFMTID;
#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
{
- return (((ULONG *)&rguid1)[0] == ((ULONG *)&rguid2)[0] &&
- ((ULONG *)&rguid1)[1] == ((ULONG *)&rguid2)[1] &&
- ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] &&
- ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]);
+ return (((unsigned int *)&rguid1)[0] == ((unsigned int *)&rguid2)[0] &&
+ ((unsigned int *)&rguid1)[1] == ((unsigned int *)&rguid2)[1] &&
+ ((unsigned int *)&rguid1)[2] == ((unsigned int *)&rguid2)[2] &&
+ ((unsigned int *)&rguid1)[3] == ((unsigned int *)&rguid2)[3]);
}
#else
#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
#define InlineIsEqualGUID(rguid1, rguid2) \
- (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \
- ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \
- ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \
- ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3])
+ (((unsigned int *)rguid1)[0] == ((unsigned int *)rguid2)[0] && \
+ ((unsigned int *)rguid1)[1] == ((unsigned int *)rguid2)[1] && \
+ ((unsigned int *)rguid1)[2] == ((unsigned int *)rguid2)[2] && \
+ ((unsigned int *)rguid1)[3] == ((unsigned int *)rguid2)[3])
#endif
#ifdef __cplusplus
More information about the wine-cvs
mailing list