Nikolay Sivov : imm32: Replace macros with helper functions.
Alexandre Julliard
julliard at winehq.org
Mon Mar 11 16:29:53 CDT 2019
Module: wine
Branch: master
Commit: c4a4146534cc47f5a60d57a4fd06400ff2472fef
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a4146534cc47f5a60d57a4fd06400ff2472fef
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Mar 7 11:23:35 2019 +0300
imm32: Replace macros with helper functions.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/imm32/imm.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 28eb00f..96a11ab 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -119,8 +119,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
static BOOL disable_ime;
-#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE)
-#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE)
+static inline BOOL is_himc_ime_unicode(const InputContextData *data)
+{
+ return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE);
+}
+
+static inline BOOL is_kbd_ime_unicode(const ImmHkl *hkl)
+{
+ return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE);
+}
static BOOL IMM_DestroyContext(HIMC hIMC);
static InputContextData* get_imc_data(HIMC hIMC);
More information about the wine-cvs
mailing list