From: Rémi Bernon rbernon@codeweavers.com
--- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/user32/user_main.c | 2 +- dlls/win32u/imm.c | 2 +- dlls/win32u/message.c | 2 +- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 2 +- include/Makefile.in | 2 +- include/{ddk/imm.h => immdev.h} | 21 +++++++++++++-------- 9 files changed, 21 insertions(+), 16 deletions(-) rename include/{ddk/imm.h => immdev.h} (95%)
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 17061ae0034..d7af6d79736 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -33,7 +33,7 @@ #include "winerror.h" #include "wine/debug.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "winnls.h" #include "winreg.h" #include "wine/list.h" diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 496dc284fbc..e6d51a1329e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -25,7 +25,7 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h"
BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL);
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 0ddbd710b6b..56d5849f469 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -21,7 +21,7 @@ #include "user_private.h" #include "controls.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h"
diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 513f116f80f..1ccc09c97b2 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -27,7 +27,7 @@ #include <pthread.h> #include "win32u_private.h" #include "ntuser_private.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2c320377e34..ed4198991cf 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -33,7 +33,7 @@ #include "hidusage.h" #include "dbt.h" #include "dde.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/server.h" #include "wine/debug.h"
diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 19a974b3c24..ee9db0ca396 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -36,7 +36,7 @@
#include "macdrv_dll.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0599159646f..7fe1e0a0b1e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -43,7 +43,7 @@ #include "x11drv_dll.h" #include "wine/debug.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h"
WINE_DEFAULT_DEBUG_CHANNEL(imm);
diff --git a/include/Makefile.in b/include/Makefile.in index 963fe1a2858..49b5f7c4b01 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -195,7 +195,6 @@ SOURCES = \ ddk/hidport.h \ ddk/hidsdi.h \ ddk/hidtypes.h \ - ddk/imm.h \ ddk/mountmgr.h \ ddk/ndis.h \ ddk/ntddcdvd.h \ @@ -359,6 +358,7 @@ SOURCES = \ imagehlp.h \ ime.h \ imm.h \ + immdev.h \ imnact.idl \ imnxport.idl \ in6addr.h \ diff --git a/include/ddk/imm.h b/include/immdev.h similarity index 95% rename from include/ddk/imm.h rename to include/immdev.h index bbbd70a596f..994bb44d74f 100644 --- a/include/ddk/imm.h +++ b/include/immdev.h @@ -16,14 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#ifndef _DDKIMM_H_ -#define _DDKIMM_H_ +#ifndef __WINE_IMMDEV_H +#define __WINE_IMMDEV_H
#ifdef __cplusplus extern "C" { #endif
-typedef struct _tagINPUTCONTEXT { +typedef struct tagINPUTCONTEXT +{ HWND hWnd; BOOL fOpen; POINT ptStatusWndPos; @@ -46,7 +47,8 @@ typedef struct _tagINPUTCONTEXT { DWORD dwReserve[3]; } INPUTCONTEXT, *LPINPUTCONTEXT;
-typedef struct _tagIMEINFO { +typedef struct tagIMEINFO +{ DWORD dwPrivateDataSize; DWORD fdwProperty; DWORD fdwConversionCaps; @@ -56,7 +58,8 @@ typedef struct _tagIMEINFO { DWORD fdwSelectCaps; } IMEINFO, *LPIMEINFO;
-typedef struct tagCOMPOSITIONSTRING { +typedef struct tagCOMPOSITIONSTRING +{ DWORD dwSize; DWORD dwCompReadAttrLen; DWORD dwCompReadAttrOffset; @@ -84,7 +87,8 @@ typedef struct tagCOMPOSITIONSTRING { DWORD dwPrivateOffset; } COMPOSITIONSTRING, *LPCOMPOSITIONSTRING;
-typedef struct tagGUIDELINE { +typedef struct tagGUIDELINE +{ DWORD dwSize; DWORD dwLevel; DWORD dwIndex; @@ -94,7 +98,8 @@ typedef struct tagGUIDELINE { DWORD dwPrivateOffset; } GUIDELINE, *LPGUIDELINE;
-typedef struct tagCANDIDATEINFO { +typedef struct tagCANDIDATEINFO +{ DWORD dwSize; DWORD dwCount; DWORD dwOffset[32]; @@ -170,4 +175,4 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMEN } /* extern "C" */ #endif
-#endif /* _DDKIMM_H_ */ +#endif /* __WINE_IMMDEV_H */