[PATCH 1/6] winemac: Move macdrv_sent_text_input to event.c.

Jacek Caban wine at gitlab.winehq.org
Wed Jun 1 19:27:53 CDT 2022


From: Jacek Caban <jacek at codeweavers.com>

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
---
 dlls/winemac.drv/event.c  | 11 +++++++++++
 dlls/winemac.drv/ime.c    | 10 ----------
 dlls/winemac.drv/macdrv.h |  1 -
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c
index 45ceb09c094..9e53bef981a 100644
--- a/dlls/winemac.drv/event.c
+++ b/dlls/winemac.drv/event.c
@@ -26,6 +26,7 @@
 #include "winuser.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(event);
+WINE_DECLARE_DEBUG_CHANNEL(imm);
 
 
 /* return the name of an Mac event */
@@ -140,6 +141,16 @@ static macdrv_event_mask get_event_mask(DWORD mask)
 }
 
 
+/***********************************************************************
+ *              macdrv_sent_text_input
+ */
+static void macdrv_sent_text_input(const macdrv_event *event)
+{
+    TRACE_(imm)("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE");
+    *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1;
+}
+
+
 /***********************************************************************
  *              macdrv_query_event
  *
diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index d1d2002fc47..00d4d9f1852 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -1451,16 +1451,6 @@ void macdrv_im_set_text(const macdrv_event *event)
         IME_NotifyComplete(himc);
 }
 
-/***********************************************************************
- *              macdrv_sent_text_input
- */
-void macdrv_sent_text_input(const macdrv_event *event)
-{
-    TRACE("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE");
-    *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1;
-}
-
-
 /**************************************************************************
  *              query_ime_char_rect
  */
diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
index 2ea6cd638c3..95ed36ff7e0 100644
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -290,7 +290,6 @@ extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN;
 extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN;
 
 extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN;
-extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN;
 extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN;
 
 /* unixlib interface */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/170



More information about the wine-devel mailing list