Alexandre Julliard : winemac.drv: Don' t register IME classes before the dll is initialized.
Alexandre Julliard
julliard at winehq.org
Thu Jun 20 15:31:16 CDT 2013
Module: wine
Branch: master
Commit: 410b728c7b04abba1a7de2a4e9ec287b593ad76f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=410b728c7b04abba1a7de2a4e9ec287b593ad76f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 20 17:02:01 2013 +0200
winemac.drv: Don't register IME classes before the dll is initialized.
---
dlls/winemac.drv/macdrv_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index d72b036..470553e 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -164,7 +164,7 @@ static void setup_options(void)
/***********************************************************************
* process_attach
*/
-static BOOL process_attach(void)
+static BOOL process_attach( HINSTANCE instance )
{
SessionAttributeBits attributes;
OSStatus status;
@@ -186,6 +186,7 @@ static BOOL process_attach(void)
set_app_icon();
macdrv_clipboard_process_attach();
+ IME_RegisterClasses( instance );
return TRUE;
}
@@ -279,8 +280,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
switch(reason)
{
case DLL_PROCESS_ATTACH:
- IME_RegisterClasses(hinst);
- ret = process_attach();
+ ret = process_attach( hinst );
break;
case DLL_THREAD_DETACH:
thread_detach();
More information about the wine-cvs
mailing list