JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/imm.h (ImmGetCompositionFont[AW],

Browse Source 
ImmSetCompositionFont[AW]): Add NOGDI guard.
This commit is contained in:
Danny Smith 2002-12-26 03:57:17 +00:00
parent c6c890e21a
commit ebe02e1884
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/w32api/ChangeLog
View File

@ -1,3 +1,8 @@
2002-12-26 Danny Smith <dannysmith@users.sourceforge.net>
* include/imm.h (ImmGetCompositionFont[AW],
ImmSetCompositionFont[AW]): Add NOGDI guard.
2002-12-19 Danny Smith <dannysmith@users.sourceforge.net> 2002-12-19 Danny Smith <dannysmith@users.sourceforge.net>
* include/ddk/hidusage.h: Remove unneccessary #pragma pack's. * include/ddk/hidusage.h: Remove unneccessary #pragma pack's.

6
winsup/w32api/include/imm.h
View File

@ -344,10 +344,12 @@ BOOL WINAPI ImmGetConversionStatus(HIMC,LPDWORD,PDWORD);
BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD); BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
BOOL WINAPI ImmGetOpenStatus(HIMC); BOOL WINAPI ImmGetOpenStatus(HIMC);
BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL); BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
#ifndef NOGDI
BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA); BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW); BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA); BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);
BOOL WINAPI ImmSetCompositionFontW(HIMC,LPLOGFONTW); BOOL WINAPI ImmSetCompositionFontW(HIMC,LPLOGFONTW);
#endif
BOOL WINAPI ImmConfigureIMEA(HKL,HWND,DWORD,PVOID); BOOL WINAPI ImmConfigureIMEA(HKL,HWND,DWORD,PVOID);
BOOL WINAPI ImmConfigureIMEW(HKL,HWND,DWORD,PVOID); BOOL WINAPI ImmConfigureIMEW(HKL,HWND,DWORD,PVOID);
LRESULT WINAPI ImmEscapeA(HKL,HIMC,UINT,PVOID); LRESULT WINAPI ImmEscapeA(HKL,HIMC,UINT,PVOID);
@ -387,8 +389,10 @@ DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUIT
#define ImmGetConversionList ImmGetConversionListW #define ImmGetConversionList ImmGetConversionListW
#define ImmEscape ImmEscapeW #define ImmEscape ImmEscapeW
#define ImmConfigureIME ImmConfigureIMEW #define ImmConfigureIME ImmConfigureIMEW
#ifndef NOGDI
#define ImmSetCompositionFont ImmSetCompositionFontW #define ImmSetCompositionFont ImmSetCompositionFontW
#define ImmGetCompositionFont ImmGetCompositionFontW #define ImmGetCompositionFont ImmGetCompositionFontW
#endif
#define ImmGetGuideLine ImmGetGuideLineW #define ImmGetGuideLine ImmGetGuideLineW
#define ImmGetCandidateList ImmGetCandidateListW #define ImmGetCandidateList ImmGetCandidateListW
#define ImmGetCandidateListCount ImmGetCandidateListCountW #define ImmGetCandidateListCount ImmGetCandidateListCountW
@ -407,8 +411,10 @@ DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUIT
#define ImmGetConversionList ImmGetConversionListA #define ImmGetConversionList ImmGetConversionListA
#define ImmEscape ImmEscapeA #define ImmEscape ImmEscapeA
#define ImmConfigureIME ImmConfigureIMEA #define ImmConfigureIME ImmConfigureIMEA
#ifndef NOGDI
#define ImmSetCompositionFont ImmSetCompositionFontA #define ImmSetCompositionFont ImmSetCompositionFontA
#define ImmGetCompositionFont ImmGetCompositionFontA #define ImmGetCompositionFont ImmGetCompositionFontA
#endif
#define ImmGetGuideLine ImmGetGuideLineA #define ImmGetGuideLine ImmGetGuideLineA
#define ImmGetCandidateList ImmGetCandidateListA #define ImmGetCandidateList ImmGetCandidateListA
#define ImmGetCandidateListCount ImmGetCandidateListCountA #define ImmGetCandidateListCount ImmGetCandidateListCountA