system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 10:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move definition of CPINFO structure from winbase.h to winnls.h

Browse source 
Add definition of CPINFOEX structure to winnls.h
This commit is contained in:
Dmitry Timoshkov 2000-02-25 21:36:27 +00:00 committed by Alexandre Julliard
parent 9ac852ae85
commit d6a494feae
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/winbase.h
View file

@ -594,19 +594,6 @@ typedef struct {
WORD wMilliseconds;
} SYSTEMTIME, *LPSYSTEMTIME;
/* Code page information.
*/
#define MAX_LEADBYTES 12
#define MAX_DEFAULTCHAR 2
typedef struct
{
UINT MaxCharSize;
BYTE DefaultChar[MAX_DEFAULTCHAR];
BYTE LeadByte[MAX_LEADBYTES];
} CPINFO, *LPCPINFO;
/* The 'overlapped' data structure used by async I/O functions.
*/
typedef struct {
@ -1278,7 +1265,6 @@ UINT WINAPI GetConsoleOutputCP(void);
DWORD WINAPI GetConsoleTitleA(LPSTR,DWORD);
DWORD WINAPI GetConsoleTitleW(LPWSTR,DWORD);
#define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle)
BOOL WINAPI GetCPInfo(UINT,LPCPINFO);
BOOL WINAPI GetCommMask(HANDLE, LPDWORD);
BOOL WINAPI GetCommModemStatus(HANDLE, LPDWORD);
HANDLE WINAPI GetCurrentProcess(void);

38
include/winnls.h
View file

@ -482,6 +482,38 @@ WCHAR towlower(WCHAR);
#define C3_ALPHA 0x8000
#define C3_NOTAPPLICABLE 0x0000
/* Code page information.
*/
#define MAX_LEADBYTES 12
#define MAX_DEFAULTCHAR 2
typedef struct
{
UINT MaxCharSize;
BYTE DefaultChar[MAX_DEFAULTCHAR];
BYTE LeadByte[MAX_LEADBYTES];
} CPINFO, *LPCPINFO;
typedef struct
{
UINT MaxCharSize;
BYTE DefaultChar[MAX_DEFAULTCHAR];
BYTE LeadByte[MAX_LEADBYTES];
WCHAR UnicodeDefaultChar;
UINT CodePage;
CHAR CodePageName[MAX_PATH];
} CPINFOEXA, *LPCPINFOEXA;
typedef struct
{
UINT MaxCharSize;
BYTE DefaultChar[MAX_DEFAULTCHAR];
BYTE LeadByte[MAX_LEADBYTES];
WCHAR UnicodeDefaultChar;
UINT CodePage;
WCHAR CodePageName[MAX_PATH];
} CPINFOEXW, *LPCPINFOEXW;
typedef DWORD CALTYPE;
typedef DWORD CALID;
@ -498,7 +530,11 @@ UINT16 WINAPI CompareString16(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
INT16 WINAPI GetLocaleInfo16(LCID,LCTYPE,LPSTR,INT16);
BOOL16 WINAPI GetStringType16(LCID,DWORD,LPCSTR,INT16,LPWORD);
LCID WINAPI ConvertDefaultLocale(LCID Locale);
BOOL WINAPI GetCPInfo(UINT,LPCPINFO);
BOOL WINAPI GetCPInfoExA(UINT,DWORD,LPCPINFOEXA);
BOOL WINAPI GetCPInfoExW(UINT,DWORD,LPCPINFOEXW);
#define GetCPInfoEx WINELIB_NAME_AW(GetCPInfoEx)
#endif /* __WINE_WINNLS_H */