marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guiddef.h: Improve __uuidof implementation. 

This patch ensures that the reference is unique and identical for all
uses in module, fixes handling of const types and uses direct reference
instead of depending on optimizer to produce sane code.

Based on patch by Kevin Puetz.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-02-05 17:12:22 +01:00 committed by Alexandre Julliard
parent 544fd9504a
commit 51b75e9a53
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/guiddef.h
View File

@ -42,30 +42,45 @@ typedef struct _GUID
#endif
/* Macros for __uuidof emulation */
#if defined(__cplusplus) && !defined(_MSC_VER)
#ifdef __cplusplus
# if defined(__MINGW32__)
# define __WINE_UUID_ATTR __attribute__((selectany))
# elif defined(__GNUC__)
# define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak))
# endif
#endif
#ifdef __WINE_UUID_ATTR
extern "C++" {
template<typename T> const GUID &__wine_uuidof();
template<typename T> struct __wine_uuidof;
template<typename T> struct __wine_uuidof_type {
typedef __wine_uuidof<T> inst;
};
template<typename T> struct __wine_uuidof_type<T *> {
typedef __wine_uuidof<T> inst;
};
template<typename T> struct __wine_uuidof_type<T * const> {
typedef __wine_uuidof<T> inst;
};
}
#define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
extern "C++" { \
template<> inline const GUID &__wine_uuidof<type>() { \
static const IID __uuid_inst = {l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \
return __uuid_inst; \
} \
template<> inline const GUID &__wine_uuidof<type*>() { \
return __wine_uuidof<type>(); \
} \
template<> struct __wine_uuidof<type> { \
static const GUID uuid; \
}; \
__WINE_UUID_ATTR const GUID __wine_uuidof<type>::uuid = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}; \
}
#define __uuidof(type) __wine_uuidof<typeof(type)>()
#define __uuidof(type) __wine_uuidof_type<typeof(type)>::inst::uuid
#else
#else /* __WINE_UUID_ATTR */
#define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
#endif
#endif /* __WINE_UUID_ATTR */
#endif