* fixed some more tchar cases into a proper ifdef unicode -W else -A structure.

git-svn-id: trunk@24922 -
This commit is contained in:
marco 2013-06-21 13:11:43 +00:00
parent 993bc2511f
commit d7f3ab848b

View File

@ -579,7 +579,7 @@ Const
TCHAR_INFO = CHAR_INFO; TCHAR_INFO = CHAR_INFO;
PCHAR_INFO = ^CHAR_INFO; PCHAR_INFO = ^CHAR_INFO;
CHARFORMAT = record CHARFORMATA = record
cbSize : UINT; cbSize : UINT;
dwMask : DWORD; dwMask : DWORD;
dwEffects : DWORD; dwEffects : DWORD;
@ -588,11 +588,37 @@ Const
crTextColor : COLORREF; crTextColor : COLORREF;
bCharSet : BYTE; bCharSet : BYTE;
bPitchAndFamily : BYTE; bPitchAndFamily : BYTE;
szFaceName : array[0..(LF_FACESIZE)-1] of TCHAR; szFaceName : array[0..(LF_FACESIZE)-1] of AnsiCHAR;
end; end;
_charformat = CHARFORMAT; _CHARFORMATA = CHARFORMATA;
Tcharformat = CHARFORMAT; TCHARFORMATA = CHARFORMATA;
Pcharformat = ^CHARFORMAT; PCHARFORMATA = ^CHARFORMATA;
CHARFORMATW = record
cbSize : UINT;
dwMask : DWORD;
dwEffects : DWORD;
yHeight : LONG;
yOffset : LONG;
crTextColor : COLORREF;
bCharSet : BYTE;
bPitchAndFamily : BYTE;
szFaceName : array[0..(LF_FACESIZE)-1] of WCHAR;
end;
_CHARFORMATW = CHARFORMATW;
TCHARFORMATW = CHARFORMATW;
PCHARFORMATW = ^CHARFORMATW;
{$ifdef Unicode}
CHARFORMAT = CHARFORMATW;
_CHARFORMAT = CHARFORMATW;
TCHARFORMAT = CHARFORMATW;
PCHARFORMAT = PCHARFORMATW;
{$else}
CHARFORMAT = CHARFORMATA;
_CHARFORMAT = CHARFORMATA;
TCHARFORMAT = CHARFORMATA;
PCHARFORMAT = PCHARFORMATA;
{$endif}
CHARRANGE = record CHARRANGE = record
cpMin : LONG; cpMin : LONG;
@ -657,7 +683,7 @@ Const
lfClipPrecision : BYTE; lfClipPrecision : BYTE;
lfQuality : BYTE; lfQuality : BYTE;
lfPitchAndFamily : BYTE; lfPitchAndFamily : BYTE;
lfFaceName : array[0..(LF_FACESIZE)-1] of TCHAR; lfFaceName : array[0..(LF_FACESIZE)-1] of AnsiCHAR;
end; end;
LPLOGFONTA = ^LOGFONTA; LPLOGFONTA = ^LOGFONTA;
_LOGFONTA = LOGFONTA; _LOGFONTA = LOGFONTA;
@ -1544,16 +1570,16 @@ Const
{$ifndef UNICODE} {$ifndef UNICODE}
CPINFOEX = CPINFOEXA; CPINFOEX = CPINFOEXA;
LPCPINFOEX = ^CPINFOEXA; LPCPINFOEX = PCPINFOEXA;
_cpinfoex = CPINFOEXA; _cpinfoex = CPINFOEXA;
Tcpinfoex = CPINFOEXA; Tcpinfoex = CPINFOEXA;
Pcpinfoex = ^CPINFOEXA; Pcpinfoex = PCPINFOEXA;
{$ELSE} {$ELSE}
CPINFOEX = CPINFOEXW; CPINFOEX = CPINFOEXW;
LPCPINFOEX = ^CPINFOEXW; LPCPINFOEX = PCPINFOEXW;
_cpinfoex = CPINFOEXW; _cpinfoex = CPINFOEXW;
Tcpinfoex = CPINFOEXW; Tcpinfoex = CPINFOEXW;
Pcpinfoex = ^CPINFOEXW; Pcpinfoex = PCPINFOEXW;
{$ENDIF} {$ENDIF}
CPLINFO = record CPLINFO = record
@ -2564,7 +2590,7 @@ Const
LCSGAMUTMATCH = LONG; LCSGAMUTMATCH = LONG;
LOGCOLORSPACE = record LOGCOLORSPACEA = record
lcsSignature : DWORD; lcsSignature : DWORD;
lcsVersion : DWORD; lcsVersion : DWORD;
lcsSize : DWORD; lcsSize : DWORD;
@ -2574,13 +2600,42 @@ Const
lcsGammaRed : DWORD; lcsGammaRed : DWORD;
lcsGammaGreen : DWORD; lcsGammaGreen : DWORD;
lcsGammaBlue : DWORD; lcsGammaBlue : DWORD;
lcsFilename : array[0..(MAX_PATH)-1] of TCHAR; lcsFilename : array[0..(MAX_PATH)-1] of ANSICHAR;
end; end;
LPLOGCOLORSPACE = ^LOGCOLORSPACE; LPLOGCOLORSPACEA = ^LOGCOLORSPACEA;
tagLOGCOLORSPACE = LOGCOLORSPACE; tagLOGCOLORSPACEA = LOGCOLORSPACEA;
TLOGCOLORSPACE = LOGCOLORSPACE; TLOGCOLORSPACEA = LOGCOLORSPACEA;
TLOGCOLORSPACEA = LOGCOLORSPACE; PLOGCOLORSPACEA = ^LOGCOLORSPACEA;
PLOGCOLORSPACE = ^LOGCOLORSPACE;
LOGCOLORSPACEW = record
lcsSignature : DWORD;
lcsVersion : DWORD;
lcsSize : DWORD;
lcsCSType : LCSCSTYPE;
lcsIntent : LCSGAMUTMATCH;
lcsEndpoints : CIEXYZTRIPLE;
lcsGammaRed : DWORD;
lcsGammaGreen : DWORD;
lcsGammaBlue : DWORD;
lcsFilename : array[0..(MAX_PATH)-1] of WIDECHAR;
end;
LPLOGCOLORSPACEW = ^LOGCOLORSPACEW;
tagLOGCOLORSPACEW = LOGCOLORSPACEW;
TLOGCOLORSPACEW = LOGCOLORSPACEW;
PLOGCOLORSPACEW = ^LOGCOLORSPACEW;
{$ifdef UNICODE}
LPLOGCOLORSPACE = PLOGCOLORSPACEW;
tagLOGCOLORSPACE = LOGCOLORSPACEW;
TLOGCOLORSPACE = LOGCOLORSPACEW;
LOGCOLORSPACE = LOGCOLORSPACEW;
PLOGCOLORSPACE = PLOGCOLORSPACEW;
{$else}
LPLOGCOLORSPACE = PLOGCOLORSPACEA;
tagLOGCOLORSPACE = LOGCOLORSPACEA;
TLOGCOLORSPACE = LOGCOLORSPACEA;
LOGCOLORSPACE = LOGCOLORSPACEA;
PLOGCOLORSPACE = PLOGCOLORSPACEA;
{$endif}
EMRCREATECOLORSPACE = record EMRCREATECOLORSPACE = record
emr : EMR; emr : EMR;
@ -3720,36 +3775,100 @@ Const
Tfindtextex = FINDTEXTEX; Tfindtextex = FINDTEXTEX;
Pfindtextex = ^FINDTEXTEX; Pfindtextex = ^FINDTEXTEX;
FMS_GETDRIVEINFO = record FMS_GETDRIVEINFOA = record
dwTotalSpace : DWORD; dwTotalSpace : DWORD;
dwFreeSpace : DWORD; dwFreeSpace : DWORD;
szPath : array[0..259] of TCHAR; szPath : array[0..259] of AnsiCHAR;
szVolume : array[0..13] of TCHAR; szVolume : array[0..13] of AnsiCHAR;
szShare : array[0..127] of TCHAR; szShare : array[0..127] of AnsiCHAR;
end; end;
_FMS_GETDRIVEINFO = FMS_GETDRIVEINFO; _FMS_GETDRIVEINFOA = FMS_GETDRIVEINFOA;
TFMSGETDRIVEINFO = FMS_GETDRIVEINFO; TFMSGETDRIVEINFOA = FMS_GETDRIVEINFOA;
PFMSGETDRIVEINFO = ^FMS_GETDRIVEINFO; PFMSGETDRIVEINFOA = ^FMS_GETDRIVEINFOA;
FMS_GETFILESEL = record FMS_GETDRIVEINFOW = record
dwTotalSpace : DWORD;
dwFreeSpace : DWORD;
szPath : array[0..259] of WCHAR;
szVolume : array[0..13] of WCHAR;
szShare : array[0..127] of WCHAR;
end;
_FMS_GETDRIVEINFOW = FMS_GETDRIVEINFOW;
TFMSGETDRIVEINFOW = FMS_GETDRIVEINFOW;
PFMSGETDRIVEINFOW = ^FMS_GETDRIVEINFOW;
{$ifdef Unicode}
_FMS_GETDRIVEINFO = FMS_GETDRIVEINFOW;
TFMSGETDRIVEINFO = FMS_GETDRIVEINFOW;
PFMSGETDRIVEINFO = PFMSGETDRIVEINFOW;
FMS_GETDRIVEINFO = FMS_GETDRIVEINFOW;
{$else}
_FMS_GETDRIVEINFO = FMS_GETDRIVEINFOA;
TFMSGETDRIVEINFO = FMS_GETDRIVEINFOA;
PFMSGETDRIVEINFO = PFMSGETDRIVEINFOA;
FMS_GETDRIVEINFO = FMS_GETDRIVEINFOA;
{$endif}
FMS_GETFILESELA = record
ftTime : FILETIME; ftTime : FILETIME;
dwSize : DWORD; dwSize : DWORD;
bAttr : BYTE; bAttr : BYTE;
szName : array[0..259] of TCHAR; szName : array[0..259] of AnsiCHAR;
end; end;
_FMS_GETFILESEL = FMS_GETFILESEL; _FMS_GETFILESELA = FMS_GETFILESELA;
TFMSGETFILESEL = FMS_GETFILESEL; TFMSGETFILESELA = FMS_GETFILESELA;
PFMSGETFILESEL = ^FMS_GETFILESEL; PFMSGETFILESELA = ^FMS_GETFILESELA;
FMS_LOAD = record FMS_GETFILESELW = record
ftTime : FILETIME;
dwSize : DWORD; dwSize : DWORD;
szMenuName : array[0..(MENU_TEXT_LEN)-1] of TCHAR; bAttr : BYTE;
szName : array[0..259] of WCHAR;
end;
_FMS_GETFILESELW = FMS_GETFILESELW;
TFMSGETFILESELW = FMS_GETFILESELW;
PFMSGETFILESELW = ^FMS_GETFILESELW;
{$ifdef Unicode}
_FMS_GETFILESEL = FMS_GETFILESELW;
TFMSGETFILESEL = FMS_GETFILESELW;
FMS_GETFILESEL = FMS_GETFILESELW;
PFMSGETFILESEL = PFMSGETFILESELW;
{$else}
_FMS_GETFILESEL = FMS_GETFILESELA;
TFMSGETFILESEL = FMS_GETFILESELA;
FMS_GETFILESEL = FMS_GETFILESELA;
PFMSGETFILESEL = PFMSGETFILESELA;
{$endif}
FMS_LOADA = record
dwSize : DWORD;
szMenuName : array[0..(MENU_TEXT_LEN)-1] of AnsiCHAR;
hMenu : HMENU; hMenu : HMENU;
wMenuDelta : UINT; wMenuDelta : UINT;
end; end;
_FMS_LOAD = FMS_LOAD; _FMS_LOADA = FMS_LOADA;
TFMSLOAD = FMS_LOAD; TFMSLOADA = FMS_LOADA;
PFMSLOAD = ^FMS_LOAD; PFMSLOADA = ^FMS_LOADA;
FMS_LOADW = record
dwSize : DWORD;
szMenuName : array[0..(MENU_TEXT_LEN)-1] of WCHAR;
hMenu : HMENU;
wMenuDelta : UINT;
end;
_FMS_LOADW = FMS_LOADW;
TFMSLOADW = FMS_LOADW;
PFMSLOADW = ^FMS_LOADW;
{$ifdef unicode}
_FMS_LOAD = FMS_LOADW;
TFMSLOAD = FMS_LOADW;
PFMSLOAD = PFMSLOADW;
FMS_LOAD = FMS_LOADW;
{$else}
_FMS_LOAD = FMS_LOADA;
TFMSLOAD = FMS_LOADA;
PFMSLOAD = PFMSLOADA;
FMS_LOAD = FMS_LOADA;
{$endif}
FMS_TOOLBARLOAD = record FMS_TOOLBARLOAD = record
dwSize : DWORD; dwSize : DWORD;
@ -3915,17 +4034,39 @@ Const
THELPINFO = HELPINFO; THELPINFO = HELPINFO;
PHELPINFO = ^HELPINFO; PHELPINFO = ^HELPINFO;
HELPWININFO = record HELPWININFOA = record
wStructSize : longint; wStructSize : longint;
x : longint; x : longint;
y : longint; y : longint;
dx : longint; dx : longint;
dy : longint; dy : longint;
wMax : longint; wMax : longint;
rgchMember : array[0..1] of TCHAR; rgchMember : array[0..1] of AnsiCHAR;
end; end;
THELPWININFO = HELPWININFO; THELPWININFOA = HELPWININFOA;
PHELPWININFO = ^HELPWININFO; PHELPWININFOA = ^HELPWININFOA;
HELPWININFOW = record
wStructSize : longint;
x : longint;
y : longint;
dx : longint;
dy : longint;
wMax : longint;
rgchMember : array[0..1] of WCHAR;
end;
THELPWININFOW = HELPWININFOW;
PHELPWININFOW = ^HELPWININFOW;
{$ifdef Unicode}
HELPWININFO = HELPWININFOW;
THELPWININFO = HELPWININFOW;
PHELPWININFO = PHELPWININFOW;
{$else}
HELPWININFO = HELPWININFOA;
THELPWININFO = HELPWININFOA;
PHELPWININFO = PHELPWININFOA;
{$endif}
HIGHCONTRAST = record HIGHCONTRAST = record
cbSize : UINT; cbSize : UINT;
@ -4616,17 +4757,40 @@ Const
TMONERRSTRUCT = MONERRSTRUCT; TMONERRSTRUCT = MONERRSTRUCT;
PMONERRSTRUCT = ^MONERRSTRUCT; PMONERRSTRUCT = ^MONERRSTRUCT;
MONHSZSTRUCT = record MONHSZSTRUCTA = record
cb : UINT; cb : UINT;
fsAction : WINBOOL; fsAction : WINBOOL;
dwTime : DWORD; dwTime : DWORD;
hsz : HSZ; hsz : HSZ;
hTask : HANDLE; hTask : HANDLE;
str : array[0..0] of TCHAR; str : array[0..0] of AnsiCHAR;
end; end;
tagMONHSZSTRUCT = MONHSZSTRUCT; tagMONHSZSTRUCTA = MONHSZSTRUCTA;
TMONHSZSTRUCT = MONHSZSTRUCT; TMONHSZSTRUCTA = MONHSZSTRUCTA;
PMONHSZSTRUCT = ^MONHSZSTRUCT; PMONHSZSTRUCTA = ^MONHSZSTRUCTA;
MONHSZSTRUCTW = record
cb : UINT;
fsAction : WINBOOL;
dwTime : DWORD;
hsz : HSZ;
hTask : HANDLE;
str : array[0..0] of WCHAR;
end;
tagMONHSZSTRUCTW = MONHSZSTRUCTW;
TMONHSZSTRUCTW = MONHSZSTRUCTW;
PMONHSZSTRUCTW = ^MONHSZSTRUCTW;
{$ifdef unicode}
tagMONHSZSTRUCT = MONHSZSTRUCTW;
TMONHSZSTRUCT = MONHSZSTRUCTW;
PMONHSZSTRUCT = PMONHSZSTRUCTW;
MONHSZSTRUCT = MONHSZSTRUCTW;
{$else}
tagMONHSZSTRUCT = MONHSZSTRUCTA;
TMONHSZSTRUCT = MONHSZSTRUCTA;
PMONHSZSTRUCT = PMONHSZSTRUCTA;
MONHSZSTRUCT = MONHSZSTRUCTA;
{$endif}
MONITOR_INFO_1 = record MONITOR_INFO_1 = record
pName : LPTSTR; pName : LPTSTR;
@ -4729,14 +4893,34 @@ Const
Tmsgfilter = MSGFILTER; Tmsgfilter = MSGFILTER;
Pmsgfilter = ^MSGFILTER; Pmsgfilter = ^MSGFILTER;
MULTIKEYHELP = record MULTIKEYHELPA = record
mkSize : DWORD; mkSize : DWORD;
mkKeylist : TCHAR; mkKeylist : TCHAR;
szKeyphrase : array[0..0] of TCHAR; szKeyphrase : array[0..0] of AnsiCHAR;
end; end;
tagMULTIKEYHELP = MULTIKEYHELP; tagMULTIKEYHELPA = MULTIKEYHELPA;
TMULTIKEYHELP = MULTIKEYHELP; TMULTIKEYHELPA = MULTIKEYHELPA;
PMULTIKEYHELP = ^MULTIKEYHELP; PMULTIKEYHELPA = ^MULTIKEYHELPA;
MULTIKEYHELPW = record
mkSize : DWORD;
mkKeylist : TCHAR;
szKeyphrase : array[0..0] of WideCHAR;
end;
tagMULTIKEYHELPW = MULTIKEYHELPW;
TMULTIKEYHELPW = MULTIKEYHELPW;
PMULTIKEYHELPW = ^MULTIKEYHELPW;
{$ifdef Unicode}
tagMULTIKEYHELP = MULTIKEYHELPW;
TMULTIKEYHELP = MULTIKEYHELPW;
PMULTIKEYHELP = PMULTIKEYHELPW;
MULTIKEYHELP = MULTIKEYHELPW;
{$else}
tagMULTIKEYHELP = MULTIKEYHELPA;
TMULTIKEYHELP = MULTIKEYHELPA;
PMULTIKEYHELP = PMULTIKEYHELPA;
MULTIKEYHELP = MULTIKEYHELPA;
{$endif}
NAME_BUFFER = record NAME_BUFFER = record
name : array[0..(NCBNAMSZ)-1] of UCHAR; name : array[0..(NCBNAMSZ)-1] of UCHAR;
@ -4811,20 +4995,45 @@ Const
PNETRESOURCE = ^NETRESOURCE; PNETRESOURCE = ^NETRESOURCE;
PNETRESOURCEA = ^NETRESOURCE; PNETRESOURCEA = ^NETRESOURCE;
NEWCPLINFO = record NEWCPLINFOA = record
dwSize : DWORD; dwSize : DWORD;
dwFlags : DWORD; dwFlags : DWORD;
dwHelpContext : DWORD; dwHelpContext : DWORD;
lData : LONG; lData : LONG;
hIcon : HICON; hIcon : HICON;
szName : array[0..31] of TCHAR; szName : array[0..31] of AnsiCHAR;
szInfo : array[0..63] of TCHAR; szInfo : array[0..63] of AnsiCHAR;
szHelpFile : array[0..127] of TCHAR; szHelpFile : array[0..127] of AnsiCHAR;
end; end;
tagNEWCPLINFO = NEWCPLINFO; tagNEWCPLINFOA = NEWCPLINFOA;
TNEWCPLINFO = NEWCPLINFO; TNEWCPLINFOA = NEWCPLINFOA;
PNEWCPLINFO = ^NEWCPLINFO; PNEWCPLINFOA = ^NEWCPLINFOA;
NEWCPLINFOW = record
dwSize : DWORD;
dwFlags : DWORD;
dwHelpContext : DWORD;
lData : LONG;
hIcon : HICON;
szName : array[0..31] of WideCHAR;
szInfo : array[0..63] of WideCHAR;
szHelpFile : array[0..127] of WideCHAR;
end;
tagNEWCPLINFOW = NEWCPLINFOW;
TNEWCPLINFOW = NEWCPLINFOW;
PNEWCPLINFOW = ^NEWCPLINFOW;
{$ifdef Unicode}
tagNEWCPLINFO = NEWCPLINFOW;
TNEWCPLINFO = NEWCPLINFOW;
PNEWCPLINFO = PNEWCPLINFOW;
NEWCPLINFO = NEWCPLINFOW;
{$else}
tagNEWCPLINFO = NEWCPLINFOA;
TNEWCPLINFO = NEWCPLINFOA;
PNEWCPLINFO = PNEWCPLINFOA;
NEWCPLINFO = NEWCPLINFOA;
{$endif}
NEWTEXTMETRICA = record NEWTEXTMETRICA = record
tmHeight : LONG; tmHeight : LONG;
tmAscent : LONG; tmAscent : LONG;
@ -5169,7 +5378,7 @@ Const
dwMinorVersion : DWORD; dwMinorVersion : DWORD;
dwBuildNumber : DWORD; dwBuildNumber : DWORD;
dwPlatformId : DWORD; dwPlatformId : DWORD;
szCSDVersion : array[0..127] of TCHAR; szCSDVersion : array[0..127] of AnsiCHAR;
end; end;
LPOSVERSIONINFOA= ^OSVERSIONINFOA; LPOSVERSIONINFOA= ^OSVERSIONINFOA;
_OSVERSIONINFOA = OSVERSIONINFOA; _OSVERSIONINFOA = OSVERSIONINFOA;