Headers diff for imm32.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.0-Windows 10 1511 10586.494 versions



 imm.h (6.3.9600.17415-Windows 8.1)   imm.h (10.0.10586.0-Windows 10 1511 10586.494) 
skipping to change at line 16 skipping to change at line 16
/* Copyright (c) Microsoft Corporation. All rights reserved. */ /* Copyright (c) Microsoft Corporation. All rights reserved. */
/**********************************************************************/ /**********************************************************************/
#ifndef _IMM_ #ifndef _IMM_
#define _IMM_ #define _IMM_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if _MSC_VER >= 1200
#pragma warning(push)
#pragma warning(disable:4820) // padding added after data member
#endif
#ifndef _IMM_SDK_DEFINED_ #ifndef _IMM_SDK_DEFINED_
#define _IMM_SDK_DEFINED_ #define _IMM_SDK_DEFINED_
#pragma region Application Family #pragma region Application Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
#if (WINVER >= 0x040A) #if (WINVER >= 0x040A)
DECLARE_HANDLE(HIMC); DECLARE_HANDLE(HIMC);
DECLARE_HANDLE(HIMCC); DECLARE_HANDLE(HIMCC);
#else #else
skipping to change at line 152 skipping to change at line 157
#else #else
typedef STYLEBUFA STYLEBUF; typedef STYLEBUFA STYLEBUF;
typedef PSTYLEBUFA PSTYLEBUF; typedef PSTYLEBUFA PSTYLEBUF;
typedef NPSTYLEBUFA NPSTYLEBUF; typedef NPSTYLEBUFA NPSTYLEBUF;
typedef LPSTYLEBUFA LPSTYLEBUF; typedef LPSTYLEBUFA LPSTYLEBUF;
#endif // UNICODE #endif // UNICODE
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
#pragma endregion #pragma endregion
#pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion
#if (WINVER >= 0x040A) #if (WINVER >= 0x040A)
#define IMEMENUITEM_STRING_SIZE 80 #define IMEMENUITEM_STRING_SIZE 80
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
typedef struct tagIMEMENUITEMINFOA { typedef struct tagIMEMENUITEMINFOA {
UINT cbSize; UINT cbSize;
UINT fType; UINT fType;
skipping to change at line 421 skipping to change at line 420
#ifdef UNICODE #ifdef UNICODE
#define ImmGetImeMenuItems ImmGetImeMenuItemsW #define ImmGetImeMenuItems ImmGetImeMenuItemsW
#else #else
#define ImmGetImeMenuItems ImmGetImeMenuItemsA #define ImmGetImeMenuItems ImmGetImeMenuItemsA
#endif // !UNICODE #endif // !UNICODE
BOOL WINAPI ImmDisableTextFrameService(DWORD idThread); BOOL WINAPI ImmDisableTextFrameService(DWORD idThread);
#endif /* WINVER >= 0x040A */ #endif /* WINVER >= 0x040A */
#if (WINVER >= 0x0602) #if (WINVER >= 0x0602)
BOOL WINAPI ImmDisableLegacyIME(); BOOL WINAPI ImmDisableLegacyIME(void);
#endif /* WINVER >= 0x0602 */ #endif /* WINVER >= 0x0602 */
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion #pragma endregion
// wParam for WM_IME_CONTROL // wParam for WM_IME_CONTROL
#define IMC_GETCANDIDATEPOS 0x0007 #define IMC_GETCANDIDATEPOS 0x0007
#define IMC_SETCANDIDATEPOS 0x0008 #define IMC_SETCANDIDATEPOS 0x0008
#define IMC_GETCOMPOSITIONFONT 0x0009 #define IMC_GETCOMPOSITIONFONT 0x0009
#define IMC_SETCOMPOSITIONFONT 0x000A #define IMC_SETCOMPOSITIONFONT 0x000A
skipping to change at line 747 skipping to change at line 746
#endif /* WINVER >= 0x040A */ #endif /* WINVER >= 0x040A */
// type of soft keyboard // type of soft keyboard
// for Windows Tranditional Chinese Edition // for Windows Tranditional Chinese Edition
#define SOFTKEYBOARD_TYPE_T1 0x0001 #define SOFTKEYBOARD_TYPE_T1 0x0001
// for Windows Simplified Chinese Edition // for Windows Simplified Chinese Edition
#define SOFTKEYBOARD_TYPE_C1 0x0002 #define SOFTKEYBOARD_TYPE_C1 0x0002
#endif // _IMM_SDK_DEFINED_ #endif // _IMM_SDK_DEFINED_
#if _MSC_VER >= 1200
#pragma warning(pop)
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // _IMM_ #endif // _IMM_
 End of changes. 4 change blocks. 
7 lines changed or deleted 10 lines changed or added


 immdev.h (6.3.9600.17415-Windows 8.1)   immdev.h (10.0.10586.0-Windows 10 1511 10586.494) 
skipping to change at line 15 skipping to change at line 15
/* Copyright (c) Microsoft Corporation. All rights reserved. */ /* Copyright (c) Microsoft Corporation. All rights reserved. */
/**********************************************************************/ /**********************************************************************/
#ifndef _IMMDEV_ #ifndef _IMMDEV_
#define _IMMDEV_ #define _IMMDEV_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if _MSC_VER >= 1200
#pragma warning(push)
#pragma warning(disable:4820) // padding added after data member
#endif
#ifndef _IMM_SDK_DEFINED_ #ifndef _IMM_SDK_DEFINED_
#define _IMM_SDK_DEFINED_ #define _IMM_SDK_DEFINED_
#pragma region Application Family #pragma region Application Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
#if (WINVER >= 0x040A) #if (WINVER >= 0x040A)
DECLARE_HANDLE(HIMC); DECLARE_HANDLE(HIMC);
DECLARE_HANDLE(HIMCC); DECLARE_HANDLE(HIMCC);
#else #else
skipping to change at line 151 skipping to change at line 156
#else #else
typedef STYLEBUFA STYLEBUF; typedef STYLEBUFA STYLEBUF;
typedef PSTYLEBUFA PSTYLEBUF; typedef PSTYLEBUFA PSTYLEBUF;
typedef NPSTYLEBUFA NPSTYLEBUF; typedef NPSTYLEBUFA NPSTYLEBUF;
typedef LPSTYLEBUFA LPSTYLEBUF; typedef LPSTYLEBUFA LPSTYLEBUF;
#endif // UNICODE #endif // UNICODE
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */
#pragma endregion #pragma endregion
#pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion
#if (WINVER >= 0x040A) #if (WINVER >= 0x040A)
#define IMEMENUITEM_STRING_SIZE 80 #define IMEMENUITEM_STRING_SIZE 80
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
typedef struct tagIMEMENUITEMINFOA { typedef struct tagIMEMENUITEMINFOA {
UINT cbSize; UINT cbSize;
UINT fType; UINT fType;
skipping to change at line 420 skipping to change at line 419
#ifdef UNICODE #ifdef UNICODE
#define ImmGetImeMenuItems ImmGetImeMenuItemsW #define ImmGetImeMenuItems ImmGetImeMenuItemsW
#else #else
#define ImmGetImeMenuItems ImmGetImeMenuItemsA #define ImmGetImeMenuItems ImmGetImeMenuItemsA
#endif // !UNICODE #endif // !UNICODE
BOOL WINAPI ImmDisableTextFrameService(DWORD idThread); BOOL WINAPI ImmDisableTextFrameService(DWORD idThread);
#endif /* WINVER >= 0x040A */ #endif /* WINVER >= 0x040A */
#if (WINVER >= 0x0602) #if (WINVER >= 0x0602)
BOOL WINAPI ImmDisableLegacyIME(); BOOL WINAPI ImmDisableLegacyIME(void);
#endif /* WINVER >= 0x0602 */ #endif /* WINVER >= 0x0602 */
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion #pragma endregion
// wParam for WM_IME_CONTROL // wParam for WM_IME_CONTROL
#define IMC_GETCANDIDATEPOS 0x0007 #define IMC_GETCANDIDATEPOS 0x0007
#define IMC_SETCANDIDATEPOS 0x0008 #define IMC_SETCANDIDATEPOS 0x0008
#define IMC_GETCOMPOSITIONFONT 0x0009 #define IMC_GETCOMPOSITIONFONT 0x0009
#define IMC_SETCOMPOSITIONFONT 0x000A #define IMC_SETCOMPOSITIONFONT 0x000A
skipping to change at line 876 skipping to change at line 875
typedef struct tagIMEINFO { typedef struct tagIMEINFO {
DWORD dwPrivateDataSize; DWORD dwPrivateDataSize;
DWORD fdwProperty; DWORD fdwProperty;
DWORD fdwConversionCaps; DWORD fdwConversionCaps;
DWORD fdwSentenceCaps; DWORD fdwSentenceCaps;
DWORD fdwUICaps; DWORD fdwUICaps;
DWORD fdwSCSCaps; DWORD fdwSCSCaps;
DWORD fdwSelectCaps; DWORD fdwSelectCaps;
} IMEINFO, *PIMEINFO, NEAR *NPIMEINFO, FAR *LPIMEINFO; } IMEINFO, *PIMEINFO, NEAR *NPIMEINFO, FAR *LPIMEINFO;
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion
typedef struct tagSOFTKBDDATA { typedef struct tagSOFTKBDDATA {
UINT uCount; UINT uCount;
WORD wCode[1][256]; WORD wCode[1][256];
} SOFTKBDDATA, *PSOFTKBDDATA, NEAR *NPSOFTKBDDATA, FAR * LPSOFTKBDDATA; } SOFTKBDDATA, *PSOFTKBDDATA, NEAR *NPSOFTKBDDATA, FAR * LPSOFTKBDDATA;
BOOL WINAPI ImmGetHotKey(IN DWORD, _Out_ LPUINT lpuModifiers, _Out_ LPUINT lpuVK ey, _Out_ LPHKL phKL); BOOL WINAPI ImmGetHotKey(IN DWORD, _Out_ LPUINT lpuModifiers, _Out_ LPUINT lpuVK ey, _Out_ LPHKL phKL);
BOOL WINAPI ImmSetHotKey(IN DWORD, IN UINT, IN UINT, IN HKL); BOOL WINAPI ImmSetHotKey(IN DWORD, IN UINT, IN UINT, IN HKL);
BOOL WINAPI ImmGenerateMessage(IN HIMC); BOOL WINAPI ImmGenerateMessage(IN HIMC);
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion
#if (WINVER >= 0x040A) #if (WINVER >= 0x040A)
#pragma region Desktop Family #pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
LRESULT WINAPI ImmRequestMessageA(IN HIMC, IN WPARAM, IN LPARAM); LRESULT WINAPI ImmRequestMessageA(IN HIMC, IN WPARAM, IN LPARAM);
LRESULT WINAPI ImmRequestMessageW(IN HIMC, IN WPARAM, IN LPARAM); LRESULT WINAPI ImmRequestMessageW(IN HIMC, IN WPARAM, IN LPARAM);
#ifdef UNICODE #ifdef UNICODE
#define ImmRequestMessage ImmRequestMessageW #define ImmRequestMessage ImmRequestMessageW
#else #else
skipping to change at line 1039 skipping to change at line 1039
#pragma endregion #pragma endregion
// String buffer length of ImeInquire // String buffer length of ImeInquire
#define IME_UI_CLASS_NAME_SIZE 16 #define IME_UI_CLASS_NAME_SIZE 16
// String buffer length of ImeEscape // String buffer length of ImeEscape
#define IME_ESC_STRING_BUFFER_SIZE 80 #define IME_ESC_STRING_BUFFER_SIZE 80
#endif // _IMM_DDK_DEFINED_ #endif // _IMM_DDK_DEFINED_
#if _MSC_VER >= 1200
#pragma warning(pop)
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // _IMMDEV_ #endif // _IMMDEV_
 End of changes. 6 change blocks. 
10 lines changed or deleted 14 lines changed or added

This html diff was produced by rfcdiff 1.41.