| imm.h (6.0.6002.18005-Windows 6.0) | | imm.h (6.1.7600.16385-Windows 7.0) |
|---|
| | |
| skipping to change at line 241 | | skipping to change at line 241 |
|---|
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
| DWORD WINAPI ImmGetGuideLineA(__in HIMC, __in DWORD dwIndex, __out_bcount_opt(dw
BufLen) LPSTR lpBuf, __in DWORD dwBufLen); | | DWORD WINAPI ImmGetGuideLineA(__in HIMC, __in DWORD dwIndex, __out_bcount_opt(dw
BufLen) LPSTR lpBuf, __in DWORD dwBufLen); |
| DWORD WINAPI ImmGetGuideLineW(__in HIMC, __in DWORD dwIndex, __out_bcount_opt(dw
BufLen) LPWSTR lpBuf, __in DWORD dwBufLen); | | DWORD WINAPI ImmGetGuideLineW(__in HIMC, __in DWORD dwIndex, __out_bcount_opt(dw
BufLen) LPWSTR lpBuf, __in DWORD dwBufLen); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define ImmGetGuideLine ImmGetGuideLineW | | #define ImmGetGuideLine ImmGetGuideLineW |
| #else | | #else |
| #define ImmGetGuideLine ImmGetGuideLineA | | #define ImmGetGuideLine ImmGetGuideLineA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
|
| BOOL WINAPI ImmGetConversionStatus(IN HIMC, __out LPDWORD lpfdwConversion, __out
LPDWORD lpfdwSentence); | | BOOL WINAPI ImmGetConversionStatus(IN HIMC, __out_opt LPDWORD lpfdwConversion, _
_out_opt LPDWORD lpfdwSentence); |
| BOOL WINAPI ImmSetConversionStatus(IN HIMC, IN DWORD, IN DWORD); | | BOOL WINAPI ImmSetConversionStatus(IN HIMC, IN DWORD, IN DWORD); |
| BOOL WINAPI ImmGetOpenStatus(IN HIMC); | | BOOL WINAPI ImmGetOpenStatus(IN HIMC); |
| BOOL WINAPI ImmSetOpenStatus(IN HIMC, IN BOOL); | | BOOL WINAPI ImmSetOpenStatus(IN HIMC, IN BOOL); |
| | |
| #if defined(_WINGDI_) && !defined(NOGDI) | | #if defined(_WINGDI_) && !defined(NOGDI) |
| BOOL WINAPI ImmGetCompositionFontA(IN HIMC, __out LPLOGFONTA lplf); | | BOOL WINAPI ImmGetCompositionFontA(IN HIMC, __out LPLOGFONTA lplf); |
| BOOL WINAPI ImmGetCompositionFontW(IN HIMC, __out LPLOGFONTW lplf); | | BOOL WINAPI ImmGetCompositionFontW(IN HIMC, __out LPLOGFONTW lplf); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define ImmGetCompositionFont ImmGetCompositionFontW | | #define ImmGetCompositionFont ImmGetCompositionFontW |
| #else | | #else |
| | |
| skipping to change at line 549 | | skipping to change at line 549 |
|---|
| #define CFS_POINT 0x0002 | | #define CFS_POINT 0x0002 |
| #define CFS_FORCE_POSITION 0x0020 | | #define CFS_FORCE_POSITION 0x0020 |
| #define CFS_CANDIDATEPOS 0x0040 | | #define CFS_CANDIDATEPOS 0x0040 |
| #define CFS_EXCLUDE 0x0080 | | #define CFS_EXCLUDE 0x0080 |
| | |
| // conversion direction for ImmGetConversionList | | // conversion direction for ImmGetConversionList |
| #define GCL_CONVERSION 0x0001 | | #define GCL_CONVERSION 0x0001 |
| #define GCL_REVERSECONVERSION 0x0002 | | #define GCL_REVERSECONVERSION 0x0002 |
| #define GCL_REVERSE_LENGTH 0x0003 | | #define GCL_REVERSE_LENGTH 0x0003 |
| | |
|
| | #include <ime_cmodes.h> |
| | |
| // bit field for conversion mode | | // bit field for conversion mode |
|
| #define IME_CMODE_ALPHANUMERIC 0x0000 | | |
| #define IME_CMODE_NATIVE 0x0001 | | |
| #define IME_CMODE_CHINESE IME_CMODE_NATIVE | | |
| // IME_CMODE_HANGEUL is old name of IME_CMODE_HANGUL. It will be gone eventually
. | | // IME_CMODE_HANGEUL is old name of IME_CMODE_HANGUL. It will be gone eventually
. |
| #define IME_CMODE_HANGEUL IME_CMODE_NATIVE | | #define IME_CMODE_HANGEUL IME_CMODE_NATIVE |
|
| #define IME_CMODE_HANGUL IME_CMODE_NATIVE | | |
| #define IME_CMODE_JAPANESE IME_CMODE_NATIVE | | |
| #define IME_CMODE_KATAKANA 0x0002 // only effect under IME_CMODE_N | | |
| ATIVE | | |
| #define IME_CMODE_LANGUAGE 0x0003 | | |
| #define IME_CMODE_FULLSHAPE 0x0008 | | |
| #define IME_CMODE_ROMAN 0x0010 | | |
| #define IME_CMODE_CHARCODE 0x0020 | | |
| #define IME_CMODE_HANJACONVERT 0x0040 | | |
| #define IME_CMODE_SOFTKBD 0x0080 | | #define IME_CMODE_SOFTKBD 0x0080 |
| #define IME_CMODE_NOCONVERSION 0x0100 | | #define IME_CMODE_NOCONVERSION 0x0100 |
| #define IME_CMODE_EUDC 0x0200 | | #define IME_CMODE_EUDC 0x0200 |
| #define IME_CMODE_SYMBOL 0x0400 | | #define IME_CMODE_SYMBOL 0x0400 |
| #define IME_CMODE_FIXED 0x0800 | | #define IME_CMODE_FIXED 0x0800 |
| #define IME_CMODE_RESERVED 0xF0000000 | | #define IME_CMODE_RESERVED 0xF0000000 |
| | |
| // bit field for sentence mode | | // bit field for sentence mode |
| #define IME_SMODE_NONE 0x0000 | | #define IME_SMODE_NONE 0x0000 |
| #define IME_SMODE_PLAURALCLAUSE 0x0001 | | #define IME_SMODE_PLAURALCLAUSE 0x0001 |
| | |
| End of changes. 4 change blocks. |
|---|
| 13 lines changed or deleted | | 3 lines changed or added |
|---|
|